You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ab...@apache.org on 2024/04/30 10:27:32 UTC

(hive) branch master updated: HIVE-27791 Eliminate totalSize check from test (#4913) (Zoltan Ratkai reviewed by Ayush Saxena, Laszlo Bodor, Butao Zhang)

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

abstractdog 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 c7bf32a87b7 HIVE-27791 Eliminate totalSize check from test (#4913) (Zoltan Ratkai reviewed by Ayush Saxena, Laszlo Bodor, Butao Zhang)
c7bf32a87b7 is described below

commit c7bf32a87b78e08dfeba8ce93b6e648c292e277c
Author: Zoltan Ratkai <11...@users.noreply.github.com>
AuthorDate: Tue Apr 30 12:27:24 2024 +0200

    HIVE-27791 Eliminate totalSize check from test (#4913) (Zoltan Ratkai reviewed by Ayush Saxena, Laszlo Bodor, Butao Zhang)
---
 .../test/results/positive/external_table_ppd.q.out |  2 +-
 .../positive/hbase_binary_storage_queries.q.out    |  4 +-
 .../src/test/results/positive/hbase_ddl.q.out      |  4 +-
 .../src/test/results/positive/hbasestats.q.out     | 10 +--
 .../negative/show_partitions_negative_test.q       |  1 -
 .../positive/alter_multi_part_table_to_iceberg.q   |  2 -
 .../queries/positive/alter_part_table_to_iceberg.q |  2 -
 .../test/queries/positive/alter_table_to_iceberg.q |  2 -
 .../test/queries/positive/create_iceberg_table.q   |  2 -
 .../create_iceberg_table_stored_as_fileformat.q    |  2 -
 .../create_iceberg_table_stored_by_iceberg.q       |  2 -
 ..._table_stored_by_iceberg_with_serdeproperties.q |  2 -
 .../src/test/queries/positive/ctlt_iceberg.q       |  2 -
 .../src/test/queries/positive/delete_all_iceberg.q |  2 -
 .../positive/describe_iceberg_metadata_tables.q    |  2 -
 .../test/queries/positive/describe_iceberg_table.q |  2 -
 .../positive/iceberg_insert_into_partition.q       |  2 -
 .../iceberg_insert_into_partition_transforms.q     |  2 -
 .../iceberg_insert_into_partition_with_evolution.q |  2 -
 .../positive/iceberg_insert_overwrite_partition.q  |  2 -
 ...iceberg_insert_overwrite_partition_transforms.q |  2 -
 .../iceberg_major_compaction_partition_evolution.q |  2 -
 .../iceberg_major_compaction_partitioned.q         |  2 -
 .../iceberg_major_compaction_schema_evolution.q    |  2 -
 .../iceberg_major_compaction_unpartitioned.q       |  2 -
 .../queries/positive/mv_iceberg_partitioned_orc.q  |  2 -
 .../queries/positive/mv_iceberg_partitioned_orc2.q |  2 -
 .../test/queries/positive/rollback_iceberg_table.q |  2 -
 .../src/test/queries/positive/row_count.q          |  2 -
 .../test/queries/positive/show_partitions_test.q   |  2 -
 .../positive/truncate_force_iceberg_table.q        |  2 -
 .../test/queries/positive/truncate_iceberg_table.q |  2 -
 .../positive/truncate_partitioned_iceberg_table.q  |  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  | 12 +--
 .../src/test/results/positive/col_stats.q.out      |  4 +-
 .../results/positive/create_iceberg_table.q.out    |  2 +-
 ...create_iceberg_table_stored_as_fileformat.q.out | 10 +--
 .../create_iceberg_table_stored_by_iceberg.q.out   |  2 +-
 ...le_stored_by_iceberg_with_serdeproperties.q.out |  2 +-
 .../positive/ctas_iceberg_partitioned_orc.q.out    |  2 +-
 .../test/results/positive/delete_all_iceberg.q.out |  6 +-
 .../results/positive/describe_iceberg_table.q.out  |  8 +-
 .../positive/iceberg_insert_into_partition.q.out   | 12 +--
 .../iceberg_insert_into_partition_transforms.q.out | 10 +--
 ...berg_insert_into_partition_with_evolution.q.out |  2 +-
 .../iceberg_insert_overwrite_partition.q.out       | 12 +--
 ...berg_major_compaction_partition_evolution.q.out |  4 +-
 .../iceberg_major_compaction_partitioned.q.out     |  8 +-
 ...iceberg_major_compaction_schema_evolution.q.out |  4 +-
 .../iceberg_major_compaction_unpartitioned.q.out   |  4 +-
 .../positive/mv_iceberg_partitioned_orc.q.out      |  4 +-
 .../positive/mv_iceberg_partitioned_orc2.q.out     |  4 +-
 .../positive/show_iceberg_materialized_views.q.out |  8 +-
 .../positive/truncate_force_iceberg_table.q.out    |  4 +-
 .../results/positive/truncate_iceberg_table.q.out  | 10 +--
 .../truncate_partitioned_iceberg_table.q.out       |  4 +-
 .../positive/use_basic_stats_from_iceberg.q.out    |  4 +-
 .../ql/txn/compactor/TestCrudCompactorOnTez.java   |  2 -
 .../org/apache/hadoop/hive/ql/QOutProcessor.java   | 38 ++++-----
 .../src/test/results/positive/kudu_queries.q.out   |  2 +-
 .../apache/hadoop/hive/ql/TestTxnNoBuckets.java    |  2 -
 .../test/queries/clientpositive/acid_no_buckets.q  |  1 -
 .../clientpositive/compaction_query_based.q        |  1 -
 .../compaction_query_based_clustered.q             |  1 -
 .../compaction_query_based_clustered_minor.q       |  1 -
 .../compaction_query_based_insert_only.q           |  1 -
 .../compaction_query_based_insert_only_clustered.q |  1 -
 ...ction_query_based_insert_only_clustered_minor.q |  1 -
 .../compaction_query_based_insert_only_minor.q     |  1 -
 ...ompaction_query_based_insert_only_partitioned.q |  1 -
 ...query_based_insert_only_partitioned_clustered.q |  1 -
 ...based_insert_only_partitioned_clustered_minor.q |  1 -
 ...ion_query_based_insert_only_partitioned_minor.q | 60 +++++++++-----
 .../clientpositive/compaction_query_based_minor.q  |  1 -
 .../compaction_query_based_partitioned.q           |  1 -
 .../compaction_query_based_partitioned_minor.q     |  1 -
 .../queries/clientpositive/default_constraint.q    |  1 -
 ql/src/test/queries/clientpositive/deleteAnalyze.q |  1 -
 .../clientpositive/external_jdbc_rowcount.q        | 28 +++----
 .../clientpositive/materialized_view_create_acid.q |  1 -
 .../materialized_view_create_rewrite.q             |  1 -
 .../materialized_view_create_rewrite_4.q           |  1 -
 ...rialized_view_create_rewrite_by_text_multi_db.q |  1 -
 .../materialized_view_create_rewrite_dummy.q       |  1 -
 .../materialized_view_create_rewrite_multi_db.q    |  1 -
 .../materialized_view_create_rewrite_time_window.q |  1 -
 ...aterialized_view_create_rewrite_time_window_2.q |  1 -
 .../clientpositive/materialized_view_parquet.q     |  2 -
 ql/src/test/queries/clientpositive/orc_analyze.q   |  2 +-
 .../queries/clientpositive/orc_llap_counters.q     |  2 +-
 .../queries/clientpositive/orc_llap_counters1.q    |  1 -
 .../test/queries/clientpositive/parquet_analyze.q  |  2 +-
 ql/src/test/queries/clientpositive/parquet_stats.q |  2 -
 .../rename_translated_external_table.q             |  2 -
 ql/src/test/queries/clientpositive/smb_mapjoin_1.q |  1 -
 .../test/queries/clientpositive/sqlmerge_stats.q   |  1 -
 .../test/queries/clientpositive/stats_histogram.q  |  1 -
 .../queries/clientpositive/stats_histogram_null.q  |  1 -
 ql/src/test/queries/clientpositive/stats_part2.q   |  1 -
 .../clientpositive/vector_string_decimal64.q       |  2 -
 .../results/clientnegative/alter_file_format.q.out |  2 +-
 .../alter_view_as_select_with_partition.q.out      |  2 +-
 .../translated_external_createexisting.q.out       |  2 +-
 .../clientnegative/unset_table_property.q.out      |  2 +-
 .../beeline/desc_table_formatted.q.out             |  2 +-
 .../clientpositive/beeline/escape_comments.q.out   |  2 +-
 .../clientpositive/beeline/smb_mapjoin_1.q.out     |  2 +-
 .../test/results/clientpositive/create_table.q.out | 14 ++--
 .../clientpositive/default_storage_handler.q.out   |  8 +-
 .../clientpositive/druid/druidmini_mv.q.out        |  6 +-
 .../erasurecoding/erasure_explain.q.out            |  4 +-
 .../erasurecoding/erasure_simple.q.out             |  2 +-
 .../results/clientpositive/infer_bucket_sort.q.out | 50 +++++------
 .../results/clientpositive/list_bucket_dml_8.q.out |  6 +-
 .../clientpositive/llap/acid_no_buckets.q.out      |  4 +-
 .../results/clientpositive/llap/acid_stats2.q.out  | 18 ++--
 .../results/clientpositive/llap/acid_stats5.q.out  | 12 +--
 .../clientpositive/llap/acid_table_stats.q.out     | 16 ++--
 .../clientpositive/llap/add_part_multiple.q.out    |  2 +-
 .../llap/alt_bucket_tlb_change_col.q.out           |  4 +-
 .../clientpositive/llap/alterColumnStats.q.out     |  6 +-
 .../clientpositive/llap/alterColumnStatsPart.q.out | 10 +--
 .../clientpositive/llap/alter_file_format.q.out    | 26 +++---
 .../llap/alter_merge_stats_orc.q.out               | 10 +--
 .../alter_numbuckets_partitioned_table2_h23.q.out  | 36 ++++----
 .../alter_numbuckets_partitioned_table_h23.q.out   | 26 +++---
 .../llap/alter_partition_clusterby_sortby.q.out    |  8 +-
 .../clientpositive/llap/alter_rename_table.q.out   |  2 +-
 .../clientpositive/llap/alter_skewed_table.q.out   | 12 +--
 .../llap/alter_table_add_partition.q.out           | 10 +--
 .../llap/alter_table_column_stats.q.out            | 96 +++++++++++-----------
 .../llap/alter_table_not_sorted.q.out              |  4 +-
 .../clientpositive/llap/alter_table_serde2.q.out   |  8 +-
 .../llap/alter_table_stats_status.q.out            | 18 ++--
 .../clientpositive/llap/analyze_tbl_date.q.out     |  2 +-
 .../clientpositive/llap/autoColumnStats_1.q.out    | 34 ++++----
 .../clientpositive/llap/autoColumnStats_10.q.out   | 16 ++--
 .../clientpositive/llap/autoColumnStats_2.q.out    | 30 +++----
 .../clientpositive/llap/autoColumnStats_3.q.out    | 16 ++--
 .../clientpositive/llap/autoColumnStats_4.q.out    |  6 +-
 .../clientpositive/llap/autoColumnStats_5.q.out    |  8 +-
 .../clientpositive/llap/autoColumnStats_5a.q.out   |  6 +-
 .../clientpositive/llap/autoColumnStats_9.q.out    |  2 +-
 .../llap/avro_extschema_insert.q.out               |  2 +-
 .../llap/avro_schema_evolution_native.q.out        |  4 +-
 .../clientpositive/llap/basicstat_partval.q.out    |  6 +-
 .../test/results/clientpositive/llap/bucket5.q.out |  2 +-
 .../clientpositive/llap/cast_null_to_complex.q.out |  2 +-
 .../clientpositive/llap/check_constraint.q.out     |  4 +-
 .../llap/colstats_date_min_max.q.out               |  2 +-
 .../llap/colstats_remove_on_col_replace.q.out      |  8 +-
 .../llap/colstats_remove_on_col_replace2.q.out     |  4 +-
 .../columnStatsUpdateForStatsOptimizer_1.q.out     | 22 ++---
 .../columnStatsUpdateForStatsOptimizer_2.q.out     |  8 +-
 ...mn_names_with_leading_and_trailing_spaces.q.out |  2 +-
 .../llap/column_pruner_multiple_children.q.out     |  2 +-
 .../clientpositive/llap/column_table_stats.q.out   | 28 +++----
 .../llap/column_table_stats_orc.q.out              | 20 ++---
 .../clientpositive/llap/columnstats_infinity.q.out |  6 +-
 .../clientpositive/llap/columnstats_partlvl.q.out  |  2 +-
 .../llap/columnstats_partlvl_dp.q.out              |  2 +-
 .../llap/compaction_query_based.q.out              |  2 +-
 .../llap/compaction_query_based_clustered.q.out    |  4 +-
 .../compaction_query_based_clustered_minor.q.out   |  4 +-
 .../llap/compaction_query_based_insert_only.q.out  |  2 +-
 ...paction_query_based_insert_only_clustered.q.out |  4 +-
 ...n_query_based_insert_only_clustered_minor.q.out |  4 +-
 .../compaction_query_based_insert_only_minor.q.out |  2 +-
 ...ction_query_based_insert_only_partitioned.q.out |  4 +-
 ...y_based_insert_only_partitioned_clustered.q.out |  4 +-
 ...d_insert_only_partitioned_clustered_minor.q.out |  4 +-
 ...query_based_insert_only_partitioned_minor.q.out | 92 ++++++++++++++-------
 .../llap/compaction_query_based_minor.q.out        |  2 +-
 .../llap/compaction_query_based_partitioned.q.out  |  4 +-
 .../compaction_query_based_partitioned_minor.q.out |  4 +-
 .../llap/create_alter_list_bucketing_table1.q.out  | 14 ++--
 .../results/clientpositive/llap/create_like.q.out  | 18 ++--
 .../results/clientpositive/llap/create_like2.q.out | 14 ++--
 .../llap/create_like_tbl_props.q.out               | 10 +--
 .../clientpositive/llap/create_like_view.q.out     |  8 +-
 .../llap/create_or_replace_view.q.out              |  8 +-
 .../clientpositive/llap/create_skewed_table1.q.out |  6 +-
 .../results/clientpositive/llap/create_table.q.out | 14 ++--
 .../llap/create_table_like_stats.q.out             |  8 +-
 .../llap/create_transactional_full_acid.q.out      |  2 +-
 .../llap/create_transactional_insert_only.q.out    |  2 +-
 .../llap/create_view_partitioned.q.out             |  6 +-
 .../llap/create_with_constraints.q.out             | 88 ++++++++++----------
 .../llap/create_with_constraints2.q.out            |  4 +-
 ql/src/test/results/clientpositive/llap/ctas.q.out | 10 +--
 .../results/clientpositive/llap/ctas_colname.q.out | 14 ++--
 .../llap/ctas_translate_external.q.out             |  4 +-
 .../llap/ctas_uses_database_location.q.out         |  2 +-
 .../llap/ctlt_translate_external.q.out             |  4 +-
 .../llap/database_default_table_type.q.out         | 22 ++---
 .../clientpositive/llap/database_location.q.out    |  4 +-
 .../clientpositive/llap/decimal_serde.q.out        |  4 +-
 .../clientpositive/llap/default_constraint.q.out   | 14 ++--
 .../clientpositive/llap/default_file_format.q.out  | 24 +++---
 .../clientpositive/llap/deleteAnalyze.q.out        |  4 +-
 .../llap/describe_comment_indent.q.out             |  2 +-
 .../llap/describe_comment_nonascii.q.out           |  2 +-
 .../llap/describe_formatted_view_partitioned.q.out |  2 +-
 .../clientpositive/llap/describe_syntax.q.out      |  8 +-
 .../clientpositive/llap/describe_table.q.out       | 12 +--
 .../llap/drop_partitions_filter.q.out              |  2 +-
 .../llap/dynpart_sort_opt_vectorization.q.out      | 32 ++++----
 .../llap/dynpart_sort_optimization.q.out           | 32 ++++----
 .../llap/dynpart_sort_optimization2.q.out          | 24 +++---
 .../clientpositive/llap/empty_result_ctas.q.out    |  6 +-
 .../clientpositive/llap/exim_hidden_files.q.out    |  2 +-
 .../clientpositive/llap/external_insert.q.out      |  4 +-
 .../llap/external_jdbc_rowcount.q.out              | 96 +++++++++++-----------
 .../llap/infer_bucket_sort_bucketed_table.q.out    |  2 +-
 .../llap/infer_bucket_sort_convert_join.q.out      |  4 +-
 .../llap/infer_bucket_sort_dyn_part.q.out          | 16 ++--
 .../infer_bucket_sort_grouping_operators.q.out     | 12 +--
 .../llap/infer_bucket_sort_list_bucket.q.out       |  4 +-
 .../llap/infer_bucket_sort_map_operators.q.out     |  8 +-
 .../llap/infer_bucket_sort_merge.q.out             |  4 +-
 .../llap/infer_bucket_sort_multi_insert.q.out      | 16 ++--
 .../llap/infer_bucket_sort_num_buckets.q.out       |  4 +-
 .../infer_bucket_sort_reducers_power_two.q.out     | 12 +--
 .../llap/insert_only_to_acid_convert.q.out         | 12 +--
 .../insert_values_orig_table_use_metadata.q.out    | 20 ++---
 .../results/clientpositive/llap/lb_fs_stats.q.out  |  2 +-
 .../clientpositive/llap/list_bucket_dml_1.q.out    |  4 +-
 .../clientpositive/llap/list_bucket_dml_10.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    |  4 +-
 .../clientpositive/llap/list_bucket_dml_5.q.out    |  4 +-
 .../clientpositive/llap/list_bucket_dml_6.q.out    |  8 +-
 .../clientpositive/llap/list_bucket_dml_7.q.out    |  8 +-
 .../clientpositive/llap/list_bucket_dml_9.q.out    |  4 +-
 .../llap/list_bucket_query_multiskew_1.q.out       |  2 +-
 .../llap/list_bucket_query_multiskew_2.q.out       |  2 +-
 .../llap/list_bucket_query_multiskew_3.q.out       |  6 +-
 .../llap/list_bucket_query_oneskew_1.q.out         |  2 +-
 .../llap/list_bucket_query_oneskew_2.q.out         |  2 +-
 .../llap/list_bucket_query_oneskew_3.q.out         |  2 +-
 .../llap/load_micromanaged_delim.q.out             |  6 +-
 .../results/clientpositive/llap/masking_mv.q.out   |  4 +-
 .../clientpositive/llap/masking_mv_by_text.q.out   |  2 +-
 .../llap/materialized_view_cluster.q.out           |  6 +-
 .../llap/materialized_view_create.q.out            |  6 +-
 .../llap/materialized_view_create_acid.q.out       |  2 +-
 .../llap/materialized_view_create_rewrite_4.q.out  | 12 +--
 .../llap/materialized_view_create_rewrite_5.q.out  |  2 +-
 ...erialized_view_create_rewrite_time_window.q.out |  6 +-
 ...ialized_view_create_rewrite_time_window_2.q.out |  6 +-
 .../llap/materialized_view_describe.q.out          | 10 +--
 .../llap/materialized_view_distribute_sort.q.out   |  6 +-
 .../llap/materialized_view_parquet.q.out           |  2 +-
 .../llap/materialized_view_partition_cluster.q.out |  6 +-
 .../llap/materialized_view_partitioned.q.out       |  2 +-
 .../test/results/clientpositive/llap/merge3.q.out  |  2 +-
 .../llap/metadataonly_acid_empty_partition.q.out   |  2 +-
 .../test/results/clientpositive/llap/mm_all.q.out  |  6 +-
 .../results/clientpositive/llap/mm_default.q.out   | 14 ++--
 .../test/results/clientpositive/llap/mm_exim.q.out |  6 +-
 .../llap/multi_insert_partitioned.q.out            | 10 +--
 .../clientpositive/llap/named_column_join.q.out    |  2 +-
 .../results/clientpositive/llap/orc_create.q.out   | 12 +--
 .../llap/outer_reference_windowed.q.out            |  2 +-
 .../clientpositive/llap/parallel_orderby.q.out     |  4 +-
 .../clientpositive/llap/parquet_analyze.q.out      |  4 +-
 .../llap/parquet_array_null_element.q.out          |  2 +-
 .../clientpositive/llap/parquet_create.q.out       |  2 +-
 .../llap/parquet_mixed_partition_formats.q.out     |  6 +-
 .../clientpositive/llap/parquet_partitioned.q.out  |  2 +-
 .../clientpositive/llap/parquet_serde.q.out        |  6 +-
 .../clientpositive/llap/parquet_stats.q.out        |  2 +-
 .../llap/part_inherit_tbl_props.q.out              |  2 +-
 .../llap/part_inherit_tbl_props_empty.q.out        |  2 +-
 .../llap/part_inherit_tbl_props_with_star.q.out    |  2 +-
 .../llap/partition_coltype_literals.q.out          | 16 ++--
 .../clientpositive/llap/partition_ctas.q.out       |  2 +-
 .../clientpositive/llap/partition_discovery.q.out  | 16 ++--
 .../llap/partition_params_postgres.q.out           |  2 +-
 .../clientpositive/llap/quotedid_basic.q.out       |  2 +-
 .../llap/quotedid_basic_standard.q.out             |  2 +-
 .../clientpositive/llap/quotedid_stats.q.out       |  4 +-
 .../llap/rcfile_default_format.q.out               | 16 ++--
 .../llap/rename_external_partition_location.q.out  |  8 +-
 .../results/clientpositive/llap/rename_table.q.out |  4 +-
 .../llap/rename_translated_external_table.q.out    |  4 +-
 .../clientpositive/llap/schema_evol_stats.q.out    | 12 +--
 .../results/clientpositive/llap/schq_analyze.q.out |  4 +-
 .../clientpositive/llap/scratch_col_issue.q.out    |  2 +-
 ql/src/test/results/clientpositive/llap/sfs.q.out  |  2 +-
 .../llap/show_materialized_views.q.out             |  8 +-
 .../clientpositive/llap/show_tblproperties.q.out   | 10 +--
 .../special_character_in_tabnames_quotes_2.q.out   |  2 +-
 .../test/results/clientpositive/llap/stats1.q.out  |  4 +-
 .../test/results/clientpositive/llap/stats10.q.out |  6 +-
 .../test/results/clientpositive/llap/stats11.q.out |  8 +-
 .../test/results/clientpositive/llap/stats12.q.out | 10 +--
 .../test/results/clientpositive/llap/stats13.q.out | 12 +--
 .../test/results/clientpositive/llap/stats14.q.out | 10 +--
 .../test/results/clientpositive/llap/stats15.q.out | 10 +--
 .../test/results/clientpositive/llap/stats16.q.out |  2 +-
 .../test/results/clientpositive/llap/stats18.q.out |  4 +-
 .../test/results/clientpositive/llap/stats2.q.out  |  4 +-
 .../test/results/clientpositive/llap/stats3.q.out  |  4 +-
 .../test/results/clientpositive/llap/stats4.q.out  | 12 +--
 .../test/results/clientpositive/llap/stats5.q.out  |  2 +-
 .../test/results/clientpositive/llap/stats6.q.out  | 10 +--
 .../test/results/clientpositive/llap/stats7.q.out  |  6 +-
 .../test/results/clientpositive/llap/stats8.q.out  | 24 +++---
 .../test/results/clientpositive/llap/stats9.q.out  |  2 +-
 .../llap/stats_empty_partition.q.out               |  2 +-
 .../llap/stats_empty_partition2.q.out              |  2 +-
 .../clientpositive/llap/stats_invalidation.q.out   |  4 +-
 .../clientpositive/llap/stats_list_bucket.q.out    |  4 +-
 .../clientpositive/llap/stats_nonpart.q.out        |  4 +-
 .../clientpositive/llap/stats_noscan_1.q.out       | 18 ++--
 .../clientpositive/llap/stats_only_null.q.out      |  4 +-
 .../results/clientpositive/llap/stats_part.q.out   | 10 +--
 .../llap/stats_part_multi_insert.q.out             |  2 +-
 .../llap/stats_part_multi_insert_acid.q.out        |  2 +-
 .../clientpositive/llap/stats_sizebug.q.out        |  4 +-
 .../test/results/clientpositive/llap/statsfs.q.out | 16 ++--
 .../results/clientpositive/llap/sysdb_schq.q.out   |  2 +-
 .../results/clientpositive/llap/temp_table.q.out   |  2 +-
 .../llap/temp_table_add_part_multiple.q.out        |  2 +-
 ...mp_table_alter_partition_clusterby_sortby.q.out |  8 +-
 .../llap/temp_table_display_colstats_tbllvl.q.out  |  6 +-
 .../llap/temp_table_drop_partitions_filter.q.out   |  2 +-
 .../llap/temp_table_multi_insert_partitioned.q.out | 10 +--
 ...emp_table_parquet_mixed_partition_formats.q.out |  6 +-
 .../llap/temp_table_parquet_partitioned.q.out      |  2 +-
 .../llap/temp_table_partition_ctas.q.out           |  2 +-
 .../llap/test_teradatabinaryfile.q.out             |  4 +-
 .../results/clientpositive/llap/tez_fsstat.q.out   |  2 +-
 .../llap/translated_external_alter.q.out           |  2 +-
 .../llap/translated_external_qopt.q.out            |  2 +-
 .../llap/translated_external_rename.q.out          |  4 +-
 .../llap/translated_external_rename2.q.out         |  4 +-
 .../llap/translated_external_rename3.q.out         |  4 +-
 .../llap/translated_external_rename4.q.out         |  4 +-
 .../llap/translated_external_rename5.q.out         |  2 +-
 .../clientpositive/llap/truncate_column.q.out      | 18 ++--
 .../clientpositive/llap/unicode_comments.q.out     |  2 +-
 .../clientpositive/llap/unicode_notation.q.out     |  6 +-
 .../clientpositive/llap/union_remove_1.q.out       |  2 +-
 .../clientpositive/llap/union_remove_10.q.out      |  2 +-
 .../clientpositive/llap/union_remove_11.q.out      |  2 +-
 .../clientpositive/llap/union_remove_12.q.out      |  2 +-
 .../clientpositive/llap/union_remove_13.q.out      |  2 +-
 .../clientpositive/llap/union_remove_14.q.out      |  2 +-
 .../clientpositive/llap/union_remove_15.q.out      |  2 +-
 .../clientpositive/llap/union_remove_16.q.out      |  2 +-
 .../clientpositive/llap/union_remove_17.q.out      |  2 +-
 .../clientpositive/llap/union_remove_18.q.out      |  2 +-
 .../clientpositive/llap/union_remove_19.q.out      |  2 +-
 .../clientpositive/llap/union_remove_2.q.out       |  2 +-
 .../clientpositive/llap/union_remove_20.q.out      |  2 +-
 .../clientpositive/llap/union_remove_21.q.out      |  2 +-
 .../clientpositive/llap/union_remove_22.q.out      |  2 +-
 .../clientpositive/llap/union_remove_23.q.out      |  2 +-
 .../clientpositive/llap/union_remove_24.q.out      |  2 +-
 .../clientpositive/llap/union_remove_25.q.out      |  6 +-
 .../clientpositive/llap/union_remove_3.q.out       |  2 +-
 .../clientpositive/llap/union_remove_4.q.out       |  2 +-
 .../clientpositive/llap/union_remove_5.q.out       |  2 +-
 .../clientpositive/llap/union_remove_7.q.out       |  2 +-
 .../clientpositive/llap/union_remove_8.q.out       |  2 +-
 .../clientpositive/llap/union_remove_9.q.out       |  2 +-
 .../llap/unset_table_view_property.q.out           | 18 ++--
 .../llap/vector_deserialize_row.q.out              |  2 +-
 .../clientpositive/llap/vectorized_stats.q.out     | 12 +--
 .../sample_islocalmode_hook_use_metadata.q.out     |  2 +-
 .../results/clientpositive/stats_noscan_2.q.out    |  8 +-
 .../clientpositive/tez/explainanalyze_5.q.out      |  2 +-
 381 files changed, 1285 insertions(+), 1336 deletions(-)

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 acf07bd82e4..fd308d72006 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
@@ -69,7 +69,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
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 24791d922f8..86241ac61f2 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
@@ -69,7 +69,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -251,7 +251,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
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 87ced4f3360..fb34dd58570 100644
--- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
@@ -126,7 +126,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -174,7 +174,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/hbase-handler/src/test/results/positive/hbasestats.q.out b/hbase-handler/src/test/results/positive/hbasestats.q.out
index 61c6df9fd5e..c00dbd5a5e7 100644
--- a/hbase-handler/src/test/results/positive/hbasestats.q.out
+++ b/hbase-handler/src/test/results/positive/hbasestats.q.out
@@ -49,7 +49,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -141,7 +141,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -208,7 +208,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -267,7 +267,7 @@ Table Parameters:
 	numRows             	2                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -378,7 +378,7 @@ Table Parameters:
 	numRows             	2                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.hbase.HBaseStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/iceberg/iceberg-handler/src/test/queries/negative/show_partitions_negative_test.q b/iceberg/iceberg-handler/src/test/queries/negative/show_partitions_negative_test.q
index 94c72f1fe78..9a8a2456c01 100644
--- a/iceberg/iceberg-handler/src/test/queries/negative/show_partitions_negative_test.q
+++ b/iceberg/iceberg-handler/src/test/queries/negative/show_partitions_negative_test.q
@@ -1,5 +1,4 @@
 -- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
index ee4ae8de38f..d3d23ba7af5 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/alter_multi_part_table_to_iceberg.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
index 74a8730eaa5..39165813a81 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/alter_part_table_to_iceberg.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+/$1#Masked#/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
index 6564515d25d..92c41b718a9 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/alter_table_to_iceberg.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q
index a96ef17894d..8db1461a134 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_as_fileformat.q b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_as_fileformat.q
index e4021874763..b9abfebea62 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_as_fileformat.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_as_fileformat.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg.q
index 6e0bb165536..695b9ec5c21 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q
index 66ddae94967..535fa4eb73d 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/create_iceberg_table_stored_by_iceberg_with_serdeproperties.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/ctlt_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/ctlt_iceberg.q
index 13d97f1ca48..c8ab29b23fe 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/ctlt_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/ctlt_iceberg.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+'uuid'=')\S+('\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/delete_all_iceberg.q b/iceberg/iceberg-handler/src/test/queries/positive/delete_all_iceberg.q
index 79f5234754d..b92781b3d17 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/delete_all_iceberg.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/delete_all_iceberg.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_metadata_tables.q b/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_metadata_tables.q
index 86d6912b88b..147684f7a6f 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_metadata_tables.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_metadata_tables.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 
 drop table if exists ice_meta_desc;
 create external table ice_meta_desc (id int, value string) stored by iceberg stored as orc;
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_table.q
index 10c07f523e8..dba602a7b46 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/describe_iceberg_table.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+/$1#Masked#/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition.q
index fc790c4f6da..74c226ca9aa 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_transforms.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_transforms.q
index cdab0a8628f..8d34a324398 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_transforms.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_transforms.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_with_evolution.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_with_evolution.q
index 321a1e3412c..72e1eedc28f 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_with_evolution.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_into_partition_with_evolution.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition.q
index 48eec186998..e4744375f04 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition_transforms.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition_transforms.q
index 55f5046a28f..5502af755a8 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition_transforms.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_insert_overwrite_partition_transforms.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partition_evolution.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partition_evolution.q
index 67b44d625a5..aef5ae0ef23 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partition_evolution.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partition_evolution.q
@@ -1,8 +1,6 @@
 -- SORT_QUERY_RESULTS
 -- Mask neededVirtualColumns due to non-strict order
 --! qt:replace:/(\s+neededVirtualColumns:\s)(.*)/$1#Masked#/
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partitioned.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partitioned.q
index 4b8dc30bdaa..9d766c6b833 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partitioned.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_partitioned.q
@@ -1,8 +1,6 @@
 -- SORT_QUERY_RESULTS
 -- Mask neededVirtualColumns due to non-strict order
 --! qt:replace:/(\s+neededVirtualColumns:\s)(.*)/$1#Masked#/
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_schema_evolution.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_schema_evolution.q
index 939904a8cba..73dbe19a94b 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_schema_evolution.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_schema_evolution.q
@@ -1,8 +1,6 @@
 -- SORT_QUERY_RESULTS
 -- Mask neededVirtualColumns due to non-strict order
 --! qt:replace:/(\s+neededVirtualColumns:\s)(.*)/$1#Masked#/
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_unpartitioned.q b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_unpartitioned.q
index 92efb00767e..eacb6a00d59 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_unpartitioned.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/iceberg_major_compaction_unpartitioned.q
@@ -1,8 +1,6 @@
 -- SORT_QUERY_RESULTS
 -- Mask neededVirtualColumns due to non-strict order
 --! qt:replace:/(\s+neededVirtualColumns:\s)(.*)/$1#Masked#/
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q
index 54fa59369ad..4e8cd3f18c4 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc.q
@@ -9,8 +9,6 @@
 --! qt:replace:/(\S\"total-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/
 -- Mask current-snapshot-timestamp-ms
 --! qt:replace:/(\s+current-snapshot-timestamp-ms\s+)\S+(\s*)/$1#Masked#$2/
--- Mask the totalSize value as it can change at file format library update
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
 
 drop materialized view if exists mat1;
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q
index f525b6b97be..a5ce60fb406 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/mv_iceberg_partitioned_orc2.q
@@ -8,8 +8,6 @@
 --! qt:replace:/(\S\"total-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/
 -- Mask current-snapshot-timestamp-ms
 --! qt:replace:/(\s+current-snapshot-timestamp-ms\s+)\S+(\s*)/$1#Masked#$2/
--- Mask the totalSize value as it can change at file format library update
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
 
 drop materialized view if exists mat1;
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/rollback_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/rollback_iceberg_table.q
index 0db54dd38bf..9ba60e6ff41 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/rollback_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/rollback_iceberg_table.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/row_count.q b/iceberg/iceberg-handler/src/test/queries/positive/row_count.q
index 02e57f4d302..aa4ead7ac47 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/row_count.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/row_count.q
@@ -4,8 +4,6 @@
 --! qt:replace:/(\s+current-snapshot-id\s+)\S+(\s*)/$1#SnapshotId#/
 -- Mask current-snapshot-timestamp-ms
 --! qt:replace:/(\s+current-snapshot-timestamp-ms\s+)\S+(\s*)/$1#Masked#/
--- Mask totalSize
---! qt:replace:/(\s+totalSize\s+)\S+(\s*)/$1#Masked#/
 -- Mask added file size
 --! qt:replace:/(\S\"added-files-size\\\":\\\")(\d+)(\\\")/$1#Masked#$3/
 -- Mask total file size
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/show_partitions_test.q b/iceberg/iceberg-handler/src/test/queries/positive/show_partitions_test.q
index ee030edf1a9..ea1fdc84cc4 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/show_partitions_test.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/show_partitions_test.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/truncate_force_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/truncate_force_iceberg_table.q
index 47526271d5f..bce0c9e8bb7 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/truncate_force_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/truncate_force_iceberg_table.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/truncate_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/truncate_iceberg_table.q
index 775a06c3483..eda36469380 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/truncate_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/truncate_iceberg_table.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
diff --git a/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q b/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
index 0b0c4af0a2c..b3352ad3614 100644
--- a/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
+++ b/iceberg/iceberg-handler/src/test/queries/positive/truncate_partitioned_iceberg_table.q
@@ -1,6 +1,4 @@
 -- SORT_QUERY_RESULTS
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- Mask random uuid
 --! qt:replace:/(\s+uuid\s+)\S+(\s*)/$1#Masked#$2/
 -- Mask a random snapshot id
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 c937e4b7674..a8d3f6572c1 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
@@ -40,7 +40,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -221,7 +221,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -307,7 +307,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -488,7 +488,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
@@ -574,7 +574,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -755,7 +755,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	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 1eae0333557..b95ffb56886 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
@@ -39,7 +39,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -176,7 +176,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -255,7 +255,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -392,7 +392,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
@@ -471,7 +471,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -608,7 +608,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	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 1918abf18e8..ca7c0490536 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
@@ -35,7 +35,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -131,7 +131,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -202,7 +202,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -298,7 +298,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
@@ -369,7 +369,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -465,7 +465,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	avro                
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 82c2a6c6984..6842264744b 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
@@ -524,7 +524,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -568,7 +568,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
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 0b9a85d90a2..61e58f57898 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
@@ -40,7 +40,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
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 54481cb0cf2..d936013c65d 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
@@ -46,7 +46,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -115,7 +115,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
@@ -184,7 +184,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	avro                
@@ -253,7 +253,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	avro                
@@ -317,7 +317,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
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 0b9a85d90a2..61e58f57898 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
@@ -40,7 +40,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
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 d7ececb5e6d..b51585336ba 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
@@ -40,7 +40,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out b/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
index f6a407b35be..2f8a228fb94 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/ctas_iceberg_partitioned_orc.q.out
@@ -311,7 +311,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	812                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
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 1a04472118f..ea29648d27e 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
@@ -128,7 +128,7 @@ Table Parameters:
 	snapshot-count      	6                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -279,7 +279,7 @@ Table Parameters:
 	snapshot-count      	6                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	copy-on-write       
@@ -430,7 +430,7 @@ Table Parameters:
 	snapshot-count      	6                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
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 e4d7e3941b3..2624ab24686 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
@@ -88,7 +88,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -146,7 +146,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -205,7 +205,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -252,7 +252,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
index 6ea485c288c..dd53979775c 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition.q.out
@@ -494,7 +494,7 @@ Table Parameters:
 	snapshot-count      	4                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -1633,7 +1633,7 @@ Table Parameters:
 	snapshot-count      	9                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2650,7 +2650,7 @@ Table Parameters:
 	snapshot-count      	9                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -3305,7 +3305,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -3960,7 +3960,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -4615,7 +4615,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
index 5b3dbd62b15..748f9d89af3 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_transforms.q.out
@@ -613,7 +613,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -1270,7 +1270,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -1927,7 +1927,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2355,7 +2355,7 @@ Table Parameters:
 	snapshot-count      	3                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2767,7 +2767,7 @@ Table Parameters:
 	snapshot-count      	3                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
index 9ed8cd184e1..1211fb22dfa 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_into_partition_with_evolution.q.out
@@ -189,7 +189,7 @@ Table Parameters:
 	snapshot-count      	4                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
index 51676fe315c..a3c16101795 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/iceberg_insert_overwrite_partition.q.out
@@ -288,7 +288,7 @@ Table Parameters:
 	snapshot-count      	4                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -1215,7 +1215,7 @@ Table Parameters:
 	snapshot-count      	9                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -1668,7 +1668,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2109,7 +2109,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2550,7 +2550,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
@@ -2991,7 +2991,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	 	 
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution.q.out
index a5ead609d45..3f8d8914c5e 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partition_evolution.q.out
@@ -254,7 +254,7 @@ Table Parameters:
 	snapshot-count      	17                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -355,7 +355,7 @@ Table Parameters:
 	snapshot-count      	19                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partitioned.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partitioned.q.out
index 09595702314..c9314bc4d03 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partitioned.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_partitioned.q.out
@@ -206,7 +206,7 @@ Table Parameters:
 	snapshot-count      	15                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -302,7 +302,7 @@ Table Parameters:
 	snapshot-count      	17                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -532,7 +532,7 @@ Table Parameters:
 	snapshot-count      	34                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -632,7 +632,7 @@ Table Parameters:
 	snapshot-count      	36                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_schema_evolution.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_schema_evolution.q.out
index f2f453b34d0..cfe8f3d3d46 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_schema_evolution.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_schema_evolution.q.out
@@ -242,7 +242,7 @@ Table Parameters:
 	snapshot-count      	17                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -340,7 +340,7 @@ Table Parameters:
 	snapshot-count      	19                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
diff --git a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_unpartitioned.q.out b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_unpartitioned.q.out
index a061d210dbe..5ba43b21a7e 100644
--- a/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_unpartitioned.q.out
+++ b/iceberg/iceberg-handler/src/test/results/positive/llap/iceberg_major_compaction_unpartitioned.q.out
@@ -198,7 +198,7 @@ Table Parameters:
 	snapshot-count      	15                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -288,7 +288,7 @@ Table Parameters:
 	snapshot-count      	17                  
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
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 de1b998e8b5..1438842c5e0 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
@@ -78,7 +78,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -163,7 +163,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
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 0c28420d5f1..0041c5c4eeb 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
@@ -79,7 +79,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -165,7 +165,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
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 8aefc76e6f9..b2f9fa0fef3 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
@@ -375,7 +375,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -426,7 +426,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -478,7 +478,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -583,7 +583,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
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 72702426b2d..87534e47f5f 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
@@ -108,7 +108,7 @@ Table Parameters:
 	snapshot-count      	3                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
@@ -180,7 +180,7 @@ Table Parameters:
 	snapshot-count      	4                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	parquet             
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 5bef73eb073..0ea5ae7a3b9 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
@@ -108,7 +108,7 @@ Table Parameters:
 	snapshot-count      	3                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -180,7 +180,7 @@ Table Parameters:
 	snapshot-count      	4                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -250,7 +250,7 @@ Table Parameters:
 	snapshot-count      	5                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -322,7 +322,7 @@ Table Parameters:
 	snapshot-count      	6                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
@@ -410,7 +410,7 @@ Table Parameters:
 	snapshot-count      	8                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	orc                 
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 8e15da1c4e6..948c31e3655 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
@@ -120,7 +120,7 @@ Table Parameters:
 	snapshot-count      	1                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	avro                
@@ -220,7 +220,7 @@ Table Parameters:
 	snapshot-count      	2                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.format.default	avro                
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 c9c2dacb3aa..bb4d4b662d0 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
@@ -171,7 +171,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
@@ -215,7 +215,7 @@ Table Parameters:
 	snapshot-count      	0                   
 	storage_handler     	org.apache.iceberg.mr.hive.HiveIcebergStorageHandler
 	table_type          	ICEBERG             
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	uuid                	#Masked#
 	write.delete.mode   	merge-on-read       
diff --git a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
index 26302e6c143..c2b3a64ee8d 100644
--- a/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
+++ b/itests/hive-unit/src/test/java/org/apache/hadoop/hive/ql/txn/compactor/TestCrudCompactorOnTez.java
@@ -865,7 +865,6 @@ public class TestCrudCompactorOnTez extends CompactorOnTezTest {
     Map<String, String> parameters = Hive.get().getTable(tblName).getParameters();
     Assert.assertEquals("The number of files is differing from the expected", "2", parameters.get("numFiles"));
     Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
-    Assert.assertEquals("The total table size is differing from the expected", "1446", parameters.get("totalSize"));
 
     //Do a major compaction
     CompactorTestUtil.runCompaction(conf, dbName, tblName, CompactionType.MAJOR, true);
@@ -881,7 +880,6 @@ public class TestCrudCompactorOnTez extends CompactorOnTezTest {
     parameters = Hive.get().getTable(tblName).getParameters();
     Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
     Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
-    Assert.assertEquals("The total table size is differing from the expected", "736", parameters.get("totalSize"));
   }
 
   @Test
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QOutProcessor.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QOutProcessor.java
index da872f17cfc..8a76fdd2da5 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QOutProcessor.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QOutProcessor.java
@@ -63,7 +63,7 @@ public class QOutProcessor {
   private static final PatternReplacementPair MASK_LINEAGE = new PatternReplacementPair(
       Pattern.compile("POSTHOOK: Lineage: .*"),
       "POSTHOOK: Lineage: ###Masked###");
-
+  
   private FsType fsType = FsType.LOCAL;
 
   public static class LineProcessingResult {
@@ -249,29 +249,9 @@ public class QOutProcessor {
         }
       }
 
-      if (!result.partialMaskWasMatched && queryMasks.contains(Mask.STATS)) {
-        matcher = MASK_STATS.pattern.matcher(result.line);
-        if (matcher.find()) {
-          result.line = result.line.replaceAll(MASK_STATS.pattern.pattern(), MASK_STATS.replacement);
-          result.partialMaskWasMatched = true;
-        }
-      }
-
-      if (!result.partialMaskWasMatched && queryMasks.contains(Mask.DATASIZE)) {
-        matcher = MASK_DATA_SIZE.pattern.matcher(result.line);
-        if (matcher.find()) {
-          result.line = result.line.replaceAll(MASK_DATA_SIZE.pattern.pattern(), MASK_DATA_SIZE.replacement);
-          result.partialMaskWasMatched = true;
-        }
-      }
-
-      if (!result.partialMaskWasMatched && queryMasks.contains(Mask.LINEAGE)) {
-        matcher = MASK_LINEAGE.pattern.matcher(result.line);
-        if (matcher.find()) {
-          result.line = result.line.replaceAll(MASK_LINEAGE.pattern.pattern(), MASK_LINEAGE.replacement);
-          result.partialMaskWasMatched = true;
-        }
-      }
+      maskPattern(result, Mask.STATS, MASK_STATS);
+      maskPattern(result, Mask.DATASIZE, MASK_DATA_SIZE);
+      maskPattern(result, Mask.LINEAGE,  MASK_LINEAGE);
 
       for (String prefix : maskIfStartsWith) {
         if (result.line.startsWith(prefix)) {
@@ -310,6 +290,15 @@ public class QOutProcessor {
     return result;
   }
 
+  private void maskPattern(LineProcessingResult result, Mask mask, PatternReplacementPair patternReplacementPair) {
+    if (!result.partialMaskWasMatched && queryMasks.contains(mask)) {
+      if (patternReplacementPair.pattern.matcher(result.line).find()) {
+        result.line = result.line.replaceAll(patternReplacementPair.pattern.pattern(), patternReplacementPair.replacement);
+        result.partialMaskWasMatched = true;
+      }
+    }
+  }
+
   private final Pattern[] partialReservedPlanMask = toPattern(new String[] {
       "data/warehouse/(.*?/)+\\.hive-staging"  // the directory might be db/table/partition
       //TODO: add more expected test result here
@@ -362,6 +351,7 @@ public class QOutProcessor {
         add(toPatternPair(PATH_HDFS_WITH_DATE_USER_GROUP_REGEX, String.format("%s %s$3$4 %s $6%s",
             HDFS_USER_MASK, HDFS_GROUP_MASK, HDFS_DATE_MASK, HDFS_MASK)));
         add(toPatternPair(PATH_HDFS_REGEX, String.format("$1%s", HDFS_MASK)));
+        add(toPatternPair("(.*totalSize\\s*=*\\s*)\\d+\\s*(.*)", "$1#Masked#$2"));
       }
     };
   }
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 c3bbfb59bb3..4570f4e5779 100644
--- a/kudu-handler/src/test/results/positive/kudu_queries.q.out
+++ b/kudu-handler/src/test/results/positive/kudu_queries.q.out
@@ -1341,7 +1341,7 @@ Table Parameters:
 	numRows             	2                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.kudu.KuduStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
index 7409179f436..5c38d8c47c2 100644
--- a/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
+++ b/ql/src/test/org/apache/hadoop/hive/ql/TestTxnNoBuckets.java
@@ -790,7 +790,6 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree /Users/ekoifman/dev/hiver
             .getParameters();
     Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
     Assert.assertEquals("The number of rows is differing from the expected", "2", parameters.get("numRows"));
-    Assert.assertEquals("The total table size is differing from the expected", "692", parameters.get("totalSize"));
 
     int[][] targetVals2 = {{5, 1, 1}, {5, 2, 2}, {5, 3, 1}, {5, 4, 2}};
     runStatementOnDriver("insert into T partition(p=1,q) " + makeValuesClause(targetVals2));
@@ -844,7 +843,6 @@ ekoifman:apache-hive-3.0.0-SNAPSHOT-bin ekoifman$ tree /Users/ekoifman/dev/hiver
             .getParameters();
     Assert.assertEquals("The number of files is differing from the expected", "1", parameters.get("numFiles"));
     Assert.assertEquals("The number of rows is differing from the expected", "4", parameters.get("numRows"));
-    Assert.assertEquals("The total table size is differing from the expected", "705", parameters.get("totalSize"));
   }
 
   @Test
diff --git a/ql/src/test/queries/clientpositive/acid_no_buckets.q b/ql/src/test/queries/clientpositive/acid_no_buckets.q
index 368c50cd7b5..b3bcb85843b 100644
--- a/ql/src/test/queries/clientpositive/acid_no_buckets.q
+++ b/ql/src/test/queries/clientpositive/acid_no_buckets.q
@@ -1,5 +1,4 @@
 --! qt:dataset:srcpart
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 --this has 4 groups of tests
 --Acid tables w/o bucketing
 --the tests with bucketing (make sure we get the same results)
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based.q b/ql/src/test/queries/clientpositive/compaction_query_based.q
index 90d85466a19..dacc503955d 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_clustered.q b/ql/src/test/queries/clientpositive/compaction_query_based_clustered.q
index 1430797c210..c5a5a59b243 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_clustered.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_clustered.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_clustered_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_clustered_minor.q
index 48a0de1e76d..fa6ccdb5b18 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_clustered_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_clustered_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only.q
index 06b9771ec1f..e323aad5f74 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered.q
index 33f204d8987..f5048e80eb1 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered_minor.q
index de0ebb651b1..5c9407d8c2c 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_clustered_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_minor.q
index 9c8c49abcb8..6aef2ca3114 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned.q
index 5dfe29d2cf7..67817f81600 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered.q
index 90fca2e8a86..3190720e363 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered_minor.q
index 1d4dc211ff5..c871eead560 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_clustered_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_minor.q
index 611ee74a9e3..1af5fe67630 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_insert_only_partitioned_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
@@ -14,28 +13,51 @@
 DROP TABLE IF EXISTS orc_partition;
 
 CREATE TABLE orc_partition
-(a STRING, b STRING)
-PARTITIONED BY (c STRING)
-STORED AS ORC TBLPROPERTIES('transactional'='true', 'transactional_properties'='insert_only');
+(
+  a STRING,
+  b STRING
+)
+PARTITIONED BY
+(
+  c STRING
+)
+STORED AS ORC
+TBLPROPERTIES ('transactional' = 'true',
+'transactional_properties' = 'insert_only');
 
-insert into orc_partition values('1', 'text1', 'part1');
-insert into orc_partition values('2', 'text2', 'part1');
-insert into orc_partition values('3', 'text3', 'part2');
-insert into orc_partition values('4', 'text4', 'part2');
-insert into orc_partition values('5', 'text5', 'part3');
-insert into orc_partition values('6', 'text6', 'part3');
-insert into orc_partition values('7', 'text7', 'part4');
-insert into orc_partition values('8', 'text8', 'part4');
-insert into orc_partition values('9', 'text9', 'part5');
-insert into orc_partition values('10', 'text10', 'part5');
+insert into orc_partition
+values ('1', 'text1', 'part1');
+insert into orc_partition
+values ('2', 'text2', 'part1');
+insert into orc_partition
+values ('3', 'text3', 'part2');
+insert into orc_partition
+values ('4', 'text4', 'part2');
+insert into orc_partition
+values ('5', 'text5', 'part3');
+insert into orc_partition
+values ('6', 'text6', 'part3');
+insert into orc_partition
+values ('7', 'text7', 'part4');
+insert into orc_partition
+values ('8', 'text8', 'part4');
+insert into orc_partition
+values ('9', 'text9', 'part5');
+insert into orc_partition
+values ('10', 'text10', 'part5');
 
 describe extended orc_partition;
 
-alter table orc_partition PARTITION (c='part1') compact 'MINOR' and wait;
-alter table orc_partition PARTITION (c='part2') compact 'MINOR' and wait;
-alter table orc_partition PARTITION (c='part3') compact 'MINOR' and wait;
-alter table orc_partition PARTITION (c='part4') compact 'MINOR' and wait;
-alter table orc_partition PARTITION (c='part5') compact 'MINOR' and wait;
+alter table orc_partition PARTITION (c='part1') compact 'MINOR' and wait
+;
+alter table orc_partition PARTITION (c='part2') compact 'MINOR' and wait
+;
+alter table orc_partition PARTITION (c='part3') compact 'MINOR' and wait
+;
+alter table orc_partition PARTITION (c='part4') compact 'MINOR' and wait
+;
+alter table orc_partition PARTITION (c='part5') compact 'MINOR' and wait
+;
 
 analyze table orc_partition compute statistics;
 describe extended orc_partition;
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_minor.q
index d4dd7976729..d3055b70553 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_partitioned.q b/ql/src/test/queries/clientpositive/compaction_query_based_partitioned.q
index d487aa24a98..f8b6d67fc56 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_partitioned.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_partitioned.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/compaction_query_based_partitioned_minor.q b/ql/src/test/queries/clientpositive/compaction_query_based_partitioned_minor.q
index c09d571c980..06b5ffd9444 100644
--- a/ql/src/test/queries/clientpositive/compaction_query_based_partitioned_minor.q
+++ b/ql/src/test/queries/clientpositive/compaction_query_based_partitioned_minor.q
@@ -5,7 +5,6 @@
 --! qt:replace:/owner:(\S*)/#Masked#/
 --! qt:replace:/skewedColValueLocationMaps:(\S*)/#Masked#/
 --! qt:replace:/transient_lastDdlTime=(\d+)/#Masked#/
---! qt:replace:/totalSize=(\d+)/#Masked#/
 --! qt:replace:/rawDataSize=(\d+)/#Masked#/
 --! qt:replace:/writeId:(\d+)/#Masked#/
 --! qt:replace:/bucketing_version=(\d+)/#Masked#/
diff --git a/ql/src/test/queries/clientpositive/default_constraint.q b/ql/src/test/queries/clientpositive/default_constraint.q
index 135f41e885a..36aa894c5f2 100644
--- a/ql/src/test/queries/clientpositive/default_constraint.q
+++ b/ql/src/test/queries/clientpositive/default_constraint.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 -- create table
 -- numeric type
 
diff --git a/ql/src/test/queries/clientpositive/deleteAnalyze.q b/ql/src/test/queries/clientpositive/deleteAnalyze.q
index c22b9e5463a..c60da972a9c 100644
--- a/ql/src/test/queries/clientpositive/deleteAnalyze.q
+++ b/ql/src/test/queries/clientpositive/deleteAnalyze.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.stats.autogather=true;
 set hive.explain.user=true;
 
diff --git a/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q b/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
index 3765f5f7b02..aa4c98b8f09 100644
--- a/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
+++ b/ql/src/test/queries/clientpositive/external_jdbc_rowcount.q
@@ -2,21 +2,21 @@ CREATE TEMPORARY FUNCTION dboutput AS 'org.apache.hadoop.hive.contrib.genericudf
 
 SELECT
 dboutput ( 'jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
-'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' );
+'CREATE TABLE SIMPLE_DERBY_TABLE11 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' );
 
 SELECT
 dboutput ( 'jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
-'CREATE TABLE SIMPLE_DERBY_TABLE2 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' );
+'CREATE TABLE SIMPLE_DERBY_TABLE12 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' );
 
 SELECT
 dboutput ( 'jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
-'CREATE TABLE SIMPLE_DERBY_TABLE3 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' );
+'CREATE TABLE SIMPLE_DERBY_TABLE13 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' );
 
 SELECT
 dboutput ( 'jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true','','',
-'CREATE TABLE SIMPLE_DERBY_TABLE4 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' );
+'CREATE TABLE SIMPLE_DERBY_TABLE14 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' );
 
-CREATE EXTERNAL TABLE ext_simple_derby_table1
+CREATE EXTERNAL TABLE ext_simple_derby_table11
 (
  ikey int,
  bkey bigint,
@@ -30,12 +30,12 @@ TBLPROPERTIES (
                 "hive.sql.jdbc.url" = "jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true;collation=TERRITORY_BASED:PRIMARY",
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE1",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE11",
                 "hive.sql.dbcp.maxActive" = "1"
 );
 
 
-CREATE EXTERNAL TABLE ext_simple_derby_table2
+CREATE EXTERNAL TABLE ext_simple_derby_table12
 (
  ikey int,
  bkey bigint,
@@ -50,11 +50,11 @@ TBLPROPERTIES (
                 "hive.sql.jdbc.url" = "jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true;collation=TERRITORY_BASED:PRIMARY",
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE2",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE12",
                 "hive.sql.dbcp.maxActive" = "1"
 );
 
-CREATE EXTERNAL TABLE ext_simple_derby_table3
+CREATE EXTERNAL TABLE ext_simple_derby_table13
 (
  ikey2 int,
  bkey2 bigint,
@@ -68,12 +68,12 @@ TBLPROPERTIES (
                 "hive.sql.jdbc.url" = "jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true;collation=TERRITORY_BASED:PRIMARY",
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE3",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE13",
                 "hive.sql.dbcp.maxActive" = "1"
 );
 
 
-CREATE EXTERNAL TABLE ext_simple_derby_table4
+CREATE EXTERNAL TABLE ext_simple_derby_table14
 (
  ikey2 int,
  bkey2 bigint,
@@ -88,18 +88,18 @@ TBLPROPERTIES (
                 "hive.sql.jdbc.url" = "jdbc:derby:;databaseName=${system:test.tmp.dir}/test_derby_as_external_table_db;create=true;collation=TERRITORY_BASED:PRIMARY",
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE4",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE14",
                 "hive.sql.dbcp.maxActive" = "1"
 );
 
 explain cbo
 with t1 as (select fkey, ikey, sum(dkey) as dk_sum, sum(dkey2) as dk2_sum
-            from ext_simple_derby_table1 left join ext_simple_derby_table3
+            from ext_simple_derby_table11 left join ext_simple_derby_table13
             on ikey = ikey2
             where fkey2 is null
             group by fkey, ikey),
 t2 as (select datekey, fkey, ikey, sum(dkey) as dk_sum2, sum(dkey2) as dk2_sum2
-       from ext_simple_derby_table2 left join ext_simple_derby_table4
+       from ext_simple_derby_table12 left join ext_simple_derby_table14
        on ikey = ikey2
        where fkey2 is null
        group by datekey, fkey, ikey)
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_acid.q b/ql/src/test/queries/clientpositive/materialized_view_create_acid.q
index dda8509fedc..35961af761c 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_acid.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_acid.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 SET hive.support.concurrency=true;
 SET hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
index 5d718625163..6b42cf30799 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 -- SORT_QUERY_RESULTS
 
 set hive.vectorized.execution.enabled=false;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
index e8a22c0a3f9..73c346ba554 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_4.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 -- Test Incremental rebuild of materialized view with aggregate but without count(*)
 -- when source tables have delete operations since last rebuild.
 SET hive.vectorized.execution.enabled=false;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_by_text_multi_db.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_by_text_multi_db.q
index 6e9034e2a55..501e67e92b1 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_by_text_multi_db.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_by_text_multi_db.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.vectorized.execution.enabled=false;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
index bdeb146aecf..1aadbffad52 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_dummy.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 -- SORT_QUERY_RESULTS
 
 SET hive.vectorized.execution.enabled=false;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
index dc07ae69522..5d390629ea1 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_multi_db.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.vectorized.execution.enabled=false;
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
index d85e33dcb87..fa07401611d 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.strict.checks.cartesian.product=false;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window_2.q b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window_2.q
index df4af8f3d8f..418ec45c91d 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window_2.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_create_rewrite_time_window_2.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.support.concurrency=true;
 set hive.txn.manager=org.apache.hadoop.hive.ql.lockmgr.DbTxnManager;
 set hive.strict.checks.cartesian.product=false;
diff --git a/ql/src/test/queries/clientpositive/materialized_view_parquet.q b/ql/src/test/queries/clientpositive/materialized_view_parquet.q
index c29f99c1006..fd24a074773 100644
--- a/ql/src/test/queries/clientpositive/materialized_view_parquet.q
+++ b/ql/src/test/queries/clientpositive/materialized_view_parquet.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 -- SORT_QUERY_RESULTS
 
 set hive.support.concurrency=true;
diff --git a/ql/src/test/queries/clientpositive/orc_analyze.q b/ql/src/test/queries/clientpositive/orc_analyze.q
index 97f27ac0703..ddf8ea1c43c 100644
--- a/ql/src/test/queries/clientpositive/orc_analyze.q
+++ b/ql/src/test/queries/clientpositive/orc_analyze.q
@@ -1,4 +1,4 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
+
 set hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 set hive.exec.submitviachild=false;
diff --git a/ql/src/test/queries/clientpositive/orc_llap_counters.q b/ql/src/test/queries/clientpositive/orc_llap_counters.q
index 130cd0167e7..584f6cbd0e5 100644
--- a/ql/src/test/queries/clientpositive/orc_llap_counters.q
+++ b/ql/src/test/queries/clientpositive/orc_llap_counters.q
@@ -1,4 +1,4 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
+
 set hive.vectorized.execution.enabled=false;
 set hive.compute.query.using.stats=false;
 set hive.mapred.mode=nonstrict;
diff --git a/ql/src/test/queries/clientpositive/orc_llap_counters1.q b/ql/src/test/queries/clientpositive/orc_llap_counters1.q
index a3571abf232..d7861fe95d1 100644
--- a/ql/src/test/queries/clientpositive/orc_llap_counters1.q
+++ b/ql/src/test/queries/clientpositive/orc_llap_counters1.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 set hive.vectorized.execution.enabled=false;
 set hive.mapred.mode=nonstrict;
 SET hive.optimize.index.filter=true;
diff --git a/ql/src/test/queries/clientpositive/parquet_analyze.q b/ql/src/test/queries/clientpositive/parquet_analyze.q
index b0170645236..8c7a51ec5c8 100644
--- a/ql/src/test/queries/clientpositive/parquet_analyze.q
+++ b/ql/src/test/queries/clientpositive/parquet_analyze.q
@@ -1,4 +1,4 @@
---! qt:replace:/((rawData|total)Size\s+)[0-9]{2,}/$1__SOME_NUMBER__/
+--! qt:replace:/((rawData)Size\s+)[0-9]{2,}/$1__SOME_NUMBER__/
 
 set hive.vectorized.execution.enabled=false;
 
diff --git a/ql/src/test/queries/clientpositive/parquet_stats.q b/ql/src/test/queries/clientpositive/parquet_stats.q
index 96d5aa87557..92eaadb2939 100644
--- a/ql/src/test/queries/clientpositive/parquet_stats.q
+++ b/ql/src/test/queries/clientpositive/parquet_stats.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 
 DROP TABLE if exists parquet_stats;
 
diff --git a/ql/src/test/queries/clientpositive/rename_translated_external_table.q b/ql/src/test/queries/clientpositive/rename_translated_external_table.q
index 9a8c5604352..281ce3069d2 100644
--- a/ql/src/test/queries/clientpositive/rename_translated_external_table.q
+++ b/ql/src/test/queries/clientpositive/rename_translated_external_table.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 set metastore.metadata.transformer.class=org.apache.hadoop.hive.metastore.MetastoreDefaultTransformer;
 
 create database if not exists tmp;
diff --git a/ql/src/test/queries/clientpositive/smb_mapjoin_1.q b/ql/src/test/queries/clientpositive/smb_mapjoin_1.q
index 1c7ee761d0c..7a98d2349e0 100644
--- a/ql/src/test/queries/clientpositive/smb_mapjoin_1.q
+++ b/ql/src/test/queries/clientpositive/smb_mapjoin_1.q
@@ -1,4 +1,3 @@
---! qt:replace:/(totalSize\s+)(\S+|\s+|.+)/$1#Masked#/
 set hive.strict.checks.bucketing=false;
 
 
diff --git a/ql/src/test/queries/clientpositive/sqlmerge_stats.q b/ql/src/test/queries/clientpositive/sqlmerge_stats.q
index fce1be55703..3913eeac57a 100644
--- a/ql/src/test/queries/clientpositive/sqlmerge_stats.q
+++ b/ql/src/test/queries/clientpositive/sqlmerge_stats.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 -- SORT_QUERY_RESULTS
 
 set hive.mapred.mode=nonstrict;
diff --git a/ql/src/test/queries/clientpositive/stats_histogram.q b/ql/src/test/queries/clientpositive/stats_histogram.q
index 799a5f33840..b98eaa349a4 100644
--- a/ql/src/test/queries/clientpositive/stats_histogram.q
+++ b/ql/src/test/queries/clientpositive/stats_histogram.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 set hive.stats.kll.enable=true;
 set metastore.stats.fetch.bitvector=true;
 set metastore.stats.fetch.kll=true;
diff --git a/ql/src/test/queries/clientpositive/stats_histogram_null.q b/ql/src/test/queries/clientpositive/stats_histogram_null.q
index 990d2a0e2ce..0d97395f922 100644
--- a/ql/src/test/queries/clientpositive/stats_histogram_null.q
+++ b/ql/src/test/queries/clientpositive/stats_histogram_null.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 set hive.stats.kll.enable=true;
 set metastore.stats.fetch.bitvector=true;
 set metastore.stats.fetch.kll=true;
diff --git a/ql/src/test/queries/clientpositive/stats_part2.q b/ql/src/test/queries/clientpositive/stats_part2.q
index 224f776c912..068e928ebea 100644
--- a/ql/src/test/queries/clientpositive/stats_part2.q
+++ b/ql/src/test/queries/clientpositive/stats_part2.q
@@ -1,4 +1,3 @@
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#/
 set hive.stats.dbclass=fs;
 set hive.stats.fetch.column.stats=true;
 set datanucleus.cache.collections=false;
diff --git a/ql/src/test/queries/clientpositive/vector_string_decimal64.q b/ql/src/test/queries/clientpositive/vector_string_decimal64.q
index 3c9d661ba63..7f236bb9f41 100644
--- a/ql/src/test/queries/clientpositive/vector_string_decimal64.q
+++ b/ql/src/test/queries/clientpositive/vector_string_decimal64.q
@@ -1,5 +1,3 @@
--- Mask the totalSize value as it can have slight variability, causing test flakiness
---! qt:replace:/(\s+totalSize\s+)\S+(\s+)/$1#Masked#$2/
 set hive.explain.user=false;
 set hive.fetch.task.conversion=none;
 
diff --git a/ql/src/test/results/clientnegative/alter_file_format.q.out b/ql/src/test/results/clientnegative/alter_file_format.q.out
index 3033cbeb413..84106eb68a5 100644
--- a/ql/src/test/results/clientnegative/alter_file_format.q.out
+++ b/ql/src/test/results/clientnegative/alter_file_format.q.out
@@ -28,7 +28,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
index 7da6c8125bb..42345f26140 100644
--- a/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
+++ b/ql/src/test/results/clientnegative/alter_view_as_select_with_partition.q.out
@@ -56,7 +56,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientnegative/translated_external_createexisting.q.out b/ql/src/test/results/clientnegative/translated_external_createexisting.q.out
index 3550da43ddb..bab6abd8f78 100644
--- a/ql/src/test/results/clientnegative/translated_external_createexisting.q.out
+++ b/ql/src/test/results/clientnegative/translated_external_createexisting.q.out
@@ -30,7 +30,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientnegative/unset_table_property.q.out b/ql/src/test/results/clientnegative/unset_table_property.q.out
index 20378a1ce01..f9194c7ee07 100644
--- a/ql/src/test/results/clientnegative/unset_table_property.q.out
+++ b/ql/src/test/results/clientnegative/unset_table_property.q.out
@@ -27,7 +27,7 @@ numFiles	0
 numFilesErasureCoded	0
 numRows	0
 rawDataSize	0
-totalSize	0
+totalSize	#Masked#
 #### A masked pattern was here ####
 FAILED: SemanticException [Error 10215]: Please use the following syntax if not sure whether the property existed or not:
 ALTER TABLE tableName UNSET TBLPROPERTIES IF EXISTS (key1, key2, ...)
diff --git a/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out b/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
index e327e0879ef..03fc4c521f2 100644
--- a/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
+++ b/ql/src/test/results/clientpositive/beeline/desc_table_formatted.q.out
@@ -399,7 +399,7 @@ Table Parameters:	NULL	NULL
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	248                 
-	totalSize           	251                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	NULL	NULL
 # Storage Information	NULL	NULL
diff --git a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
index 7b927b0dfdc..9ffc0661df1 100644
--- a/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
+++ b/ql/src/test/results/clientpositive/beeline/escape_comments.q.out
@@ -98,7 +98,7 @@ Table Parameters:	NULL	NULL
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	NULL	NULL
 # Storage Information	NULL	NULL
diff --git a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
index ea1f2603fd7..4a1faeda7b5 100644
--- a/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
+++ b/ql/src/test/results/clientpositive/beeline/smb_mapjoin_1.q.out
@@ -60,7 +60,7 @@ POSTHOOK: Input: default@smb_bucket_1_n3
 	numRows             	0                   
 	rawDataSize         	0                   
 	serialization.format	1                   
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 # Detailed Table Information	NULL	NULL
 # Storage Information	NULL	NULL
diff --git a/ql/src/test/results/clientpositive/create_table.q.out b/ql/src/test/results/clientpositive/create_table.q.out
index f408986f8f5..74819b8431a 100644
--- a/ql/src/test/results/clientpositive/create_table.q.out
+++ b/ql/src/test/results/clientpositive/create_table.q.out
@@ -51,7 +51,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -119,7 +119,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -187,7 +187,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -255,7 +255,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -321,7 +321,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -385,7 +385,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -446,7 +446,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/default_storage_handler.q.out b/ql/src/test/results/clientpositive/default_storage_handler.q.out
index 5d188039561..d9941eb46cd 100644
--- a/ql/src/test/results/clientpositive/default_storage_handler.q.out
+++ b/ql/src/test/results/clientpositive/default_storage_handler.q.out
@@ -39,7 +39,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.ql.log.syslog.SyslogStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -93,7 +93,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hadoop.hive.ql.log.syslog.SyslogStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -150,7 +150,7 @@ Table Parameters:
 	numRows             	0                   
 	rawDataSize         	0                   
 	storage_handler     	org.apache.hive.storage.jdbc.JdbcStorageHandler
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -194,7 +194,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
index c75920e3976..734431a0174 100644
--- a/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
+++ b/ql/src/test/results/clientpositive/druid/druidmini_mv.q.out
@@ -93,7 +93,7 @@ numFilesErasureCoded	0
 numRows	2
 rawDataSize	0
 storage_handler	org.apache.hadoop.hive.druid.DruidStorageHandler
-totalSize	0
+totalSize	#Masked#        
 #### A masked pattern was here ####
 PREHOOK: query: CREATE MATERIALIZED VIEW IF NOT EXISTS cmv_mat_view2_n0
 STORED BY 'org.apache.hadoop.hive.druid.DruidStorageHandler'
@@ -141,7 +141,7 @@ numFilesErasureCoded	0
 numRows	3
 rawDataSize	0
 storage_handler	org.apache.hadoop.hive.druid.DruidStorageHandler
-totalSize	0
+totalSize	#Masked#        
 #### A masked pattern was here ####
 PREHOOK: query: EXPLAIN
 SELECT a, c
@@ -591,7 +591,7 @@ numFilesErasureCoded	0
 numRows	3
 rawDataSize	0
 storage_handler	org.apache.hadoop.hive.druid.DruidStorageHandler
-totalSize	0
+totalSize	#Masked#        
 #### A masked pattern was here ####
 Warning: Shuffle Join MERGEJOIN[10][tables = [cmv_mat_view2_n0, $hdt$_0]] in Stage 'Reducer 2' is a cross product
 PREHOOK: query: EXPLAIN
diff --git a/ql/src/test/results/clientpositive/erasurecoding/erasure_explain.q.out b/ql/src/test/results/clientpositive/erasurecoding/erasure_explain.q.out
index c948f8d71ff..f806591e961 100644
--- a/ql/src/test/results/clientpositive/erasurecoding/erasure_explain.q.out
+++ b/ql/src/test/results/clientpositive/erasurecoding/erasure_explain.q.out
@@ -52,7 +52,7 @@ Table Parameters:
 	numPartitions       	4                   
 	numRows             	2000                
 	rawDataSize         	21248               
-	totalSize           	23248               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -329,7 +329,7 @@ Table Parameters:
 	numFilesErasureCoded	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
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 b6e8e89d519..74ea050a1ff 100644
--- a/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out
+++ b/ql/src/test/results/clientpositive/erasurecoding/erasure_simple.q.out
@@ -123,7 +123,7 @@ numFiles	1
 numFilesErasureCoded	1
 numRows	500
 rawDataSize	5312
-totalSize	5812
+totalSize	#Masked#
 #### A masked pattern was here ####
 ECHO unset the default policy on erasure_coding1
 Unset EC policy
diff --git a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
index bfdc84e24ec..ac67dbbc647 100644
--- a/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
+++ b/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
@@ -42,7 +42,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -91,7 +91,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -140,7 +140,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -189,7 +189,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -238,7 +238,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	4970                
-	totalSize           	5998                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -287,7 +287,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2654                
 	rawDataSize         	28466               
-	totalSize           	31120               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -336,7 +336,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2654                
 	rawDataSize         	28466               
-	totalSize           	31120               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -385,7 +385,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -434,7 +434,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -483,7 +483,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -532,7 +532,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -581,7 +581,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -630,7 +630,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -679,7 +679,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -728,7 +728,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -777,7 +777,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -826,7 +826,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	6                   
 	rawDataSize         	18                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -875,7 +875,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	6                   
 	rawDataSize         	18                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -924,7 +924,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	618                 
 	rawDataSize         	2964                
-	totalSize           	3582                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -973,7 +973,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	19                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1022,7 +1022,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1071,7 +1071,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1120,7 +1120,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1169,7 +1169,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1218,7 +1218,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	309                 
 	rawDataSize         	3582                
-	totalSize           	3891                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
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 dcdefdfe132..a164b42fceb 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
@@ -307,7 +307,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	16                  
 	rawDataSize         	136                 
-	totalSize           	310                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -348,7 +348,7 @@ Partition Parameters:
 	numFiles            	6                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10734               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -398,7 +398,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10586               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
index 9b3df1134d8..a8c8e0ab9eb 100644
--- a/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_no_buckets.q.out
@@ -336,7 +336,7 @@ Table Parameters:
 	numPartitions       	4                   
 	numRows             	2003                
 	rawDataSize         	0                   
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -446,7 +446,7 @@ Table Parameters:
 	numPartitions       	4                   
 	numRows             	2003                
 	rawDataSize         	0                   
-	totalSize           	#Masked#               
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/acid_stats2.q.out b/ql/src/test/results/clientpositive/llap/acid_stats2.q.out
index c38829e15ba..80d31d3d5dd 100644
--- a/ql/src/test/results/clientpositive/llap/acid_stats2.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_stats2.q.out
@@ -312,7 +312,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	3                   
 	rawDataSize         	0                   
-	totalSize           	1548                
+	totalSize           	#Masked#                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -349,7 +349,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	0                   
-	totalSize           	749                 
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -384,7 +384,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	799                 
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -459,7 +459,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	2247                
+	totalSize           	#Masked#                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -496,7 +496,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	1448                
+	totalSize           	#Masked#                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -531,7 +531,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	799                 
+	totalSize           	#Masked#                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -633,7 +633,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	1                   
 	rawDataSize         	0                   
-	totalSize           	2941                
+	totalSize           	#Masked#                
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -670,7 +670,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	1448                
+	totalSize           	#Masked#                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -705,7 +705,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1                   
 	rawDataSize         	0                   
-	totalSize           	1493                
+	totalSize           	#Masked#                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/acid_stats5.q.out b/ql/src/test/results/clientpositive/llap/acid_stats5.q.out
index ed29a09793a..343c9e57bb4 100644
--- a/ql/src/test/results/clientpositive/llap/acid_stats5.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_stats5.q.out
@@ -93,7 +93,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	2                   
 	rawDataSize         	10                  
-	totalSize           	18                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -303,7 +303,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	15                  
-	totalSize           	18                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -451,7 +451,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	15                  
-	totalSize           	18                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -549,7 +549,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -716,7 +716,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -864,7 +864,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/acid_table_stats.q.out b/ql/src/test/results/clientpositive/llap/acid_table_stats.q.out
index 98f614966b3..a68555f638d 100644
--- a/ql/src/test/results/clientpositive/llap/acid_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/acid_table_stats.q.out
@@ -39,7 +39,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -98,7 +98,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	0                   
-	totalSize           	4375                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -183,7 +183,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	0                   
-	totalSize           	4375                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -232,7 +232,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	0                   
-	totalSize           	4375                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -327,7 +327,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	2000                
 	rawDataSize         	0                   
-	totalSize           	8750                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -374,7 +374,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	2000                
 	rawDataSize         	0                   
-	totalSize           	8750                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -538,7 +538,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -597,7 +597,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	176000              
-	totalSize           	3339                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/add_part_multiple.q.out b/ql/src/test/results/clientpositive/llap/add_part_multiple.q.out
index 8fbbe2ae0b0..34474e8ed51 100644
--- a/ql/src/test/results/clientpositive/llap/add_part_multiple.q.out
+++ b/ql/src/test/results/clientpositive/llap/add_part_multiple.q.out
@@ -39,7 +39,7 @@ STAGE PLANS:
             location: B
             partition spec: {ds=2010-02-01}
           Partition
-            params: {totalSize=0, numRows=0, rawDataSize=0, COLUMN_STATS_ACCURATE={"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}, numFiles=0, numFilesErasureCoded=0}
+            params: {totalSize=#Masked#, numRows=0, rawDataSize=0, COLUMN_STATS_ACCURATE={"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}, numFiles=0, numFilesErasureCoded=0}
             partition spec: {ds=2010-03-01}
           Partition
             location: C
diff --git a/ql/src/test/results/clientpositive/llap/alt_bucket_tlb_change_col.q.out b/ql/src/test/results/clientpositive/llap/alt_bucket_tlb_change_col.q.out
index 006b53bf24e..0203cd2fd32 100644
--- a/ql/src/test/results/clientpositive/llap/alt_bucket_tlb_change_col.q.out
+++ b/ql/src/test/results/clientpositive/llap/alt_bucket_tlb_change_col.q.out
@@ -33,7 +33,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -82,7 +82,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alterColumnStats.q.out b/ql/src/test/results/clientpositive/llap/alterColumnStats.q.out
index 08d4117b842..5bdde1f1832 100644
--- a/ql/src/test/results/clientpositive/llap/alterColumnStats.q.out
+++ b/ql/src/test/results/clientpositive/llap/alterColumnStats.q.out
@@ -35,7 +35,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -82,7 +82,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -127,7 +127,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alterColumnStatsPart.q.out b/ql/src/test/results/clientpositive/llap/alterColumnStatsPart.q.out
index 1f026ff3b32..0f5fe1e73d7 100644
--- a/ql/src/test/results/clientpositive/llap/alterColumnStatsPart.q.out
+++ b/ql/src/test/results/clientpositive/llap/alterColumnStatsPart.q.out
@@ -39,7 +39,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -104,7 +104,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	3                   
-	totalSize           	4                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -262,7 +262,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	3                   
-	totalSize           	4                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -373,7 +373,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -558,7 +558,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_file_format.q.out b/ql/src/test/results/clientpositive/llap/alter_file_format.q.out
index 6d060d869fc..1d886f0535f 100644
--- a/ql/src/test/results/clientpositive/llap/alter_file_format.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_file_format.q.out
@@ -28,7 +28,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -72,7 +72,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -116,7 +116,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -160,7 +160,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -204,7 +204,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -248,7 +248,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -292,7 +292,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -350,7 +350,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -397,7 +397,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -444,7 +444,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -491,7 +491,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -538,7 +538,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -585,7 +585,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
index acbc951c426..898f8f2e55f 100644
--- a/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_merge_stats_orc.q.out
@@ -93,7 +93,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	147000              
-	totalSize           	7617                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -144,7 +144,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1500                
 	rawDataSize         	147000              
-	totalSize           	7224                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -243,7 +243,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	141000              
-	totalSize           	7617                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -290,7 +290,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1500                
 	rawDataSize         	147000              
-	totalSize           	7617                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -345,7 +345,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1500                
 	rawDataSize         	147000              
-	totalSize           	7224                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out
index e6de7843992..906c78a2f06 100644
--- a/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table2_h23.q.out
@@ -33,7 +33,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -80,7 +80,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -129,7 +129,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -176,7 +176,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -225,7 +225,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -272,7 +272,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -321,7 +321,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -368,7 +368,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -417,7 +417,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -464,7 +464,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -513,7 +513,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -560,7 +560,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -609,7 +609,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -656,7 +656,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -705,7 +705,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -752,7 +752,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -801,7 +801,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -848,7 +848,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out
index 8b0a9422093..8e78a05b3fa 100644
--- a/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_numbuckets_partitioned_table_h23.q.out
@@ -42,7 +42,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -89,7 +89,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -144,7 +144,7 @@ Partition Parameters:
 	numFiles            	12                  
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -185,7 +185,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -233,7 +233,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -270,7 +270,7 @@ Partition Parameters:
 	numFiles            	12                  
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -319,7 +319,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -357,7 +357,7 @@ Partition Parameters:
 	numFiles            	12                  
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -406,7 +406,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -455,7 +455,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -504,7 +504,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -553,7 +553,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -602,7 +602,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out b/ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out
index fba4835e203..de0202ea2a4 100644
--- a/ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_partition_clusterby_sortby.q.out
@@ -47,7 +47,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -94,7 +94,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -141,7 +141,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -182,7 +182,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_rename_table.q.out b/ql/src/test/results/clientpositive/llap/alter_rename_table.q.out
index 150e49fca0f..1965c3c65b7 100644
--- a/ql/src/test/results/clientpositive/llap/alter_rename_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_rename_table.q.out
@@ -343,7 +343,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out b/ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out
index 603054e8821..cfbe011b1cb 100644
--- a/ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_skewed_table.q.out
@@ -28,7 +28,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -72,7 +72,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -133,7 +133,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -177,7 +177,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -232,7 +232,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -278,7 +278,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out b/ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out
index 949588f5c68..e39285901f0 100644
--- a/ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_table_add_partition.q.out
@@ -32,7 +32,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -78,7 +78,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -114,7 +114,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -162,7 +162,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -198,7 +198,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out b/ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out
index 8b3bd1e6daf..7384695e0a2 100644
--- a/ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_table_column_stats.q.out
@@ -106,7 +106,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -212,7 +212,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -314,7 +314,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -416,7 +416,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -522,7 +522,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -638,7 +638,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -676,7 +676,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -768,7 +768,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -876,7 +876,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -914,7 +914,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1006,7 +1006,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1112,7 +1112,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1150,7 +1150,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1242,7 +1242,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1350,7 +1350,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1388,7 +1388,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1480,7 +1480,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1588,7 +1588,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1626,7 +1626,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1718,7 +1718,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1826,7 +1826,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2103,7 +2103,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2209,7 +2209,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2311,7 +2311,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2413,7 +2413,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2519,7 +2519,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2635,7 +2635,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2673,7 +2673,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2765,7 +2765,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2873,7 +2873,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2911,7 +2911,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3003,7 +3003,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3109,7 +3109,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3147,7 +3147,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3239,7 +3239,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3347,7 +3347,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3385,7 +3385,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3477,7 +3477,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3585,7 +3585,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3623,7 +3623,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3715,7 +3715,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	312                 
-	totalSize           	332                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3823,7 +3823,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	30                  
 	rawDataSize         	466                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4081,7 +4081,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4152,7 +4152,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4229,7 +4229,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4268,7 +4268,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4343,7 +4343,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4382,7 +4382,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	154                 
-	totalSize           	164                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out b/ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out
index ebd04c82c19..1c8cc0016cf 100644
--- a/ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_table_not_sorted.q.out
@@ -29,7 +29,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -74,7 +74,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out b/ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out
index c328004cc4d..fa2cbff6e4c 100644
--- a/ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_table_serde2.q.out
@@ -33,7 +33,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -80,7 +80,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -129,7 +129,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -177,7 +177,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out b/ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out
index 4bc97c38e3d..42979305967 100644
--- a/ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out
+++ b/ql/src/test/results/clientpositive/llap/alter_table_stats_status.q.out
@@ -56,7 +56,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -138,7 +138,7 @@ Table Parameters:
 	numRows             	500                 
 	rawDataSize         	5312                
 	testtblstats        	unchange            
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -183,7 +183,7 @@ Table Parameters:
 	numRows             	1000                
 	rawDataSize         	5312                
 	testtblstats        	unchange            
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -229,7 +229,7 @@ Table Parameters:
 	numRows             	500                 
 	rawDataSize         	5312                
 	testtblstats        	unchange            
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -276,7 +276,7 @@ Table Parameters:
 	numRows             	500                 
 	rawDataSize         	5312                
 	testtblstats        	unchange            
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -362,7 +362,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -446,7 +446,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -494,7 +494,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1000                
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -546,7 +546,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/analyze_tbl_date.q.out b/ql/src/test/results/clientpositive/llap/analyze_tbl_date.q.out
index 8ae97303f58..33938ee4461 100644
--- a/ql/src/test/results/clientpositive/llap/analyze_tbl_date.q.out
+++ b/ql/src/test/results/clientpositive/llap/analyze_tbl_date.q.out
@@ -46,7 +46,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	6                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
index 77580abc2a8..50c644c3d2d 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_1.q.out
@@ -70,7 +70,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -151,7 +151,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -186,7 +186,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -275,7 +275,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -310,7 +310,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -371,7 +371,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	508                 
 	rawDataSize         	5400                
-	totalSize           	5908                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -426,7 +426,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -488,7 +488,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	4                   
-	totalSize           	6                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -683,7 +683,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	1406                
-	totalSize           	1906                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -772,7 +772,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	38                  
-	totalSize           	43                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -821,7 +821,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	25                  
 	rawDataSize         	191                 
-	totalSize           	216                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -964,7 +964,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1023,7 +1023,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	242                 
 	rawDataSize         	2566                
-	totalSize           	2808                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1084,7 +1084,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1153,7 +1153,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	6                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1214,7 +1214,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1295,7 +1295,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
index ea042f386d9..64d4bed6083 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_10.q.out
@@ -35,7 +35,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -82,7 +82,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -127,7 +127,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -213,7 +213,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	16                  
-	totalSize           	18                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -305,7 +305,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -352,7 +352,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -397,7 +397,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	8                   
-	totalSize           	9                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -483,7 +483,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	16                  
-	totalSize           	18                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
index 28a12c72e71..3e5830aaedf 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_2.q.out
@@ -70,7 +70,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -207,7 +207,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -242,7 +242,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -437,7 +437,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	508                 
 	rawDataSize         	5400                
-	totalSize           	5908                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -638,7 +638,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -683,7 +683,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	1406                
-	totalSize           	1906                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -809,7 +809,7 @@ Table:              	alter5
 #### A masked pattern was here ####
 Partition Parameters:	 	 
 	numFiles            	1                   
-	totalSize           	1906                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -898,7 +898,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	38                  
-	totalSize           	43                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -947,7 +947,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	25                  
 	rawDataSize         	191                 
-	totalSize           	216                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1090,7 +1090,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1149,7 +1149,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	242                 
 	rawDataSize         	2566                
-	totalSize           	2808                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1210,7 +1210,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1279,7 +1279,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	6                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1340,7 +1340,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1421,7 +1421,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out
index 9cc3f3519db..bbcb7cddf6f 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_3.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -89,7 +89,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -146,7 +146,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -215,7 +215,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	6                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -267,7 +267,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	6                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -305,7 +305,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	8                   
-	totalSize           	10                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -374,7 +374,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	12                  
-	totalSize           	16                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -412,7 +412,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	16                  
-	totalSize           	20                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_4.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_4.q.out
index 1ebc46204dc..94fd96f7ee1 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_4.q.out
@@ -28,7 +28,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -214,7 +214,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	10                  
 	rawDataSize         	0                   
-	totalSize           	1898                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -257,7 +257,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	8                   
 	rawDataSize         	0                   
-	totalSize           	2615                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_5.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_5.q.out
index 8af751cdfdb..0e146550194 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_5.q.out
@@ -154,7 +154,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	4                   
 	rawDataSize         	40                  
-	totalSize           	44                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -219,7 +219,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	4                   
 	rawDataSize         	40                  
-	totalSize           	44                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -384,7 +384,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	4                   
 	rawDataSize         	56                  
-	totalSize           	60                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -566,7 +566,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	78                  
-	totalSize           	84                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out
index 10947ae5cb7..a6218663cb6 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_5a.q.out
@@ -254,7 +254,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	10                  
-	totalSize           	11                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -630,7 +630,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	4                   
 	rawDataSize         	40                  
-	totalSize           	44                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -668,7 +668,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	40                  
-	totalSize           	44                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/autoColumnStats_9.q.out b/ql/src/test/results/clientpositive/llap/autoColumnStats_9.q.out
index 0947cc90e2a..3410392f584 100644
--- a/ql/src/test/results/clientpositive/llap/autoColumnStats_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/autoColumnStats_9.q.out
@@ -198,7 +198,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/avro_extschema_insert.q.out b/ql/src/test/results/clientpositive/llap/avro_extschema_insert.q.out
index 2fc143af963..b083819fddc 100644
--- a/ql/src/test/results/clientpositive/llap/avro_extschema_insert.q.out
+++ b/ql/src/test/results/clientpositive/llap/avro_extschema_insert.q.out
@@ -62,7 +62,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/avro_schema_evolution_native.q.out b/ql/src/test/results/clientpositive/llap/avro_schema_evolution_native.q.out
index 2c50fb661f9..7b8c2abe3aa 100644
--- a/ql/src/test/results/clientpositive/llap/avro_schema_evolution_native.q.out
+++ b/ql/src/test/results/clientpositive/llap/avro_schema_evolution_native.q.out
@@ -108,7 +108,7 @@ Table Parameters:
 	numPartitions       	7                   
 	numRows             	8                   
 	rawDataSize         	0                   
-	totalSize           	3707                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -220,7 +220,7 @@ Table Parameters:
 	numPartitions       	7                   
 	numRows             	8                   
 	rawDataSize         	0                   
-	totalSize           	3707                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/basicstat_partval.q.out b/ql/src/test/results/clientpositive/llap/basicstat_partval.q.out
index bb318ed409c..e0713b8104e 100644
--- a/ql/src/test/results/clientpositive/llap/basicstat_partval.q.out
+++ b/ql/src/test/results/clientpositive/llap/basicstat_partval.q.out
@@ -50,7 +50,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	3                   
 	rawDataSize         	3                   
-	totalSize           	6                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -86,7 +86,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -122,7 +122,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	2                   
-	totalSize           	4                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/bucket5.q.out b/ql/src/test/results/clientpositive/llap/bucket5.q.out
index 4a8392c7e7b..3c0c95d3452 100644
--- a/ql/src/test/results/clientpositive/llap/bucket5.q.out
+++ b/ql/src/test/results/clientpositive/llap/bucket5.q.out
@@ -591,7 +591,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/cast_null_to_complex.q.out b/ql/src/test/results/clientpositive/llap/cast_null_to_complex.q.out
index d6db733df7a..a38a3a43e05 100644
--- a/ql/src/test/results/clientpositive/llap/cast_null_to_complex.q.out
+++ b/ql/src/test/results/clientpositive/llap/cast_null_to_complex.q.out
@@ -92,7 +92,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	11                  
-	totalSize           	12                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/check_constraint.q.out b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
index 143331420f4..14dbcc022d9 100644
--- a/ql/src/test/results/clientpositive/llap/check_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/check_constraint.q.out
@@ -632,7 +632,7 @@ Table Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
 	bucketing_version   	2                   
 	numFiles            	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -4143,7 +4143,7 @@ Table Type:         	MANAGED_TABLE
 Table Parameters:	 	 
 	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/colstats_date_min_max.q.out b/ql/src/test/results/clientpositive/llap/colstats_date_min_max.q.out
index ec1dbc2cd8a..c65ca80cd8e 100644
--- a/ql/src/test/results/clientpositive/llap/colstats_date_min_max.q.out
+++ b/ql/src/test/results/clientpositive/llap/colstats_date_min_max.q.out
@@ -66,7 +66,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	100                 
-	totalSize           	110                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace.q.out b/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace.q.out
index c9219dfcfb5..c1f26d1748f 100644
--- a/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace.q.out
+++ b/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace.q.out
@@ -49,7 +49,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -103,7 +103,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -163,7 +163,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -217,7 +217,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace2.q.out b/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace2.q.out
index 244545cb635..9b77a54e6c7 100644
--- a/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace2.q.out
+++ b/ql/src/test/results/clientpositive/llap/colstats_remove_on_col_replace2.q.out
@@ -49,7 +49,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -102,7 +102,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	4                   
-	totalSize           	5                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
index f4d4ba7baa6..4661b287593 100644
--- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_1.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -87,7 +87,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -232,7 +232,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	21                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -304,7 +304,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
-	totalSize           	32                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -495,7 +495,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
-	totalSize           	32                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -640,7 +640,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	28                  
-	totalSize           	32                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -720,7 +720,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	12                  
-	totalSize           	15                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -848,7 +848,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	12                  
-	totalSize           	15                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -911,7 +911,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	16                  
-	totalSize           	20                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1039,7 +1039,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1082,7 +1082,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_2.q.out b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_2.q.out
index 5a9e8460625..7f9293a2463 100644
--- a/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnStatsUpdateForStatsOptimizer_2.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	24                  
-	totalSize           	585                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -89,7 +89,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	36                  
-	totalSize           	585                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -187,7 +187,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	36                  
-	totalSize           	585                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -329,7 +329,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
index f8787b4c2c8..e0f5447860c 100644
--- a/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_names_with_leading_and_trailing_spaces.q.out
@@ -29,7 +29,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/column_pruner_multiple_children.q.out b/ql/src/test/results/clientpositive/llap/column_pruner_multiple_children.q.out
index d67da55817d..9387c1051c3 100644
--- a/ql/src/test/results/clientpositive/llap/column_pruner_multiple_children.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_pruner_multiple_children.q.out
@@ -166,7 +166,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	7                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
index d3285d519a0..2980b6a3d0f 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats.q.out
@@ -41,7 +41,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -221,7 +221,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -301,7 +301,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -550,7 +550,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -588,7 +588,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -626,7 +626,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -710,7 +710,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -959,7 +959,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -997,7 +997,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1035,7 +1035,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1119,7 +1119,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1322,7 +1322,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1360,7 +1360,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1397,7 +1397,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
index 418386b1c1a..43997a54798 100644
--- a/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
+++ b/ql/src/test/results/clientpositive/llap/column_table_stats_orc.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	170                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -223,7 +223,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	174                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -302,7 +302,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	2                   
 	rawDataSize         	340                 
-	totalSize           	584                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -544,7 +544,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	2                   
 	rawDataSize         	348                 
-	totalSize           	584                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -582,7 +582,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	174                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -620,7 +620,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	174                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -703,7 +703,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	2                   
 	rawDataSize         	340                 
-	totalSize           	584                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -903,7 +903,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	2                   
 	rawDataSize         	344                 
-	totalSize           	584                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -941,7 +941,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	174                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -979,7 +979,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	170                 
-	totalSize           	292                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out b/ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out
index 32d5c377dfd..69ec58b6595 100644
--- a/ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnstats_infinity.q.out
@@ -102,7 +102,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1250                
-	totalSize           	1255                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -162,7 +162,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1250                
-	totalSize           	1255                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -284,7 +284,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1250                
-	totalSize           	1255                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/columnstats_partlvl.q.out b/ql/src/test/results/clientpositive/llap/columnstats_partlvl.q.out
index fa857847bda..7ca3606db5e 100644
--- a/ql/src/test/results/clientpositive/llap/columnstats_partlvl.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnstats_partlvl.q.out
@@ -305,7 +305,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	92                  
-	totalSize           	105                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/columnstats_partlvl_dp.q.out b/ql/src/test/results/clientpositive/llap/columnstats_partlvl_dp.q.out
index fd775b56bea..d77ac1f544e 100644
--- a/ql/src/test/results/clientpositive/llap/columnstats_partlvl_dp.q.out
+++ b/ql/src/test/results/clientpositive/llap/columnstats_partlvl_dp.q.out
@@ -190,7 +190,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	7                   
 	rawDataSize         	57                  
-	totalSize           	64                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based.q.out
index 2c733ec3331..d9152bb6549 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based.q.out
@@ -67,4 +67,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered.q.out
index 23c885dd882..3472669f74f 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered.q.out
@@ -121,7 +121,7 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
 PREHOOK: query: alter table orc_table compact 'MAJOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_table
@@ -147,4 +147,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered_minor.q.out
index e21d0968cd6..b275f638935 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_clustered_minor.q.out
@@ -121,7 +121,7 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
 PREHOOK: query: alter table orc_table compact 'MINOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_table
@@ -147,4 +147,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, par [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only.q.out
index 47d98bbc5f3..8be40048f3e 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only.q.out
@@ -67,4 +67,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered.q.out
index d834da01fc0..c6ea2c196eb 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered.q.out
@@ -121,7 +121,7 @@ POSTHOOK: Input: default@orc_bucketed
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
+Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
 PREHOOK: query: alter table orc_bucketed compact 'MAJOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_bucketed
@@ -147,4 +147,4 @@ POSTHOOK: Input: default@orc_bucketed
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
+Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered_minor.q.out
index 5afe60ba2ac..ff25dc1b9a9 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_clustered_minor.q.out
@@ -121,7 +121,7 @@ POSTHOOK: Input: default@orc_bucketed
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
+Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
 PREHOOK: query: alter table orc_bucketed compact 'MINOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_bucketed
@@ -147,4 +147,4 @@ POSTHOOK: Input: default@orc_bucketed
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
+Detailed Table Information	Table(tableName:orc_bucketed, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde,  [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_minor.q.out
index 23974c0905f..154068b0436 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_minor.q.out
@@ -67,4 +67,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned.q.out
index e5e42905d4f..97348bf7eb1 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned.q.out
@@ -142,7 +142,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
 PREHOOK: query: alter table orc_partition PARTITION (c='part1') compact 'MAJOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition
@@ -215,4 +215,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered.q.out
index 6b619005d2d..3924e8c24f1 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered.q.out
@@ -144,7 +144,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
+Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
 PREHOOK: query: alter table orc_partition_clustered PARTITION (c='part1') compact 'MAJOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition_clustered
@@ -217,4 +217,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
+Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered_minor.q.out
index 43a2ce91327..e80bc22a5cd 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_clustered_minor.q.out
@@ -144,7 +144,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
+Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
 PREHOOK: query: alter table orc_partition_clustered PARTITION (c='part1') compact 'MINOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition_clustered
@@ -217,4 +217,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
+Detailed Table Information	Table(tableName:orc_partition_clustered, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:3, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io. [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_minor.q.out
index 69df47dc222..18d06a3dafe 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_insert_only_partitioned_minor.q.out
@@ -5,123 +5,159 @@ POSTHOOK: query: DROP TABLE IF EXISTS orc_partition
 POSTHOOK: type: DROPTABLE
 POSTHOOK: Output: database:default
 PREHOOK: query: CREATE TABLE orc_partition
-(a STRING, b STRING)
-PARTITIONED BY (c STRING)
-STORED AS ORC TBLPROPERTIES('transactional'='true', 'transactional_properties'='insert_only')
+(
+  a STRING,
+  b STRING
+)
+PARTITIONED BY
+(
+  c STRING
+)
+STORED AS ORC
+TBLPROPERTIES ('transactional' = 'true',
+'transactional_properties' = 'insert_only')
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
 PREHOOK: Output: default@orc_partition
 POSTHOOK: query: CREATE TABLE orc_partition
-(a STRING, b STRING)
-PARTITIONED BY (c STRING)
-STORED AS ORC TBLPROPERTIES('transactional'='true', 'transactional_properties'='insert_only')
+(
+  a STRING,
+  b STRING
+)
+PARTITIONED BY
+(
+  c STRING
+)
+STORED AS ORC
+TBLPROPERTIES ('transactional' = 'true',
+'transactional_properties' = 'insert_only')
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@orc_partition
-PREHOOK: query: insert into orc_partition values('1', 'text1', 'part1')
+PREHOOK: query: insert into orc_partition
+values ('1', 'text1', 'part1')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('1', 'text1', 'part1')
+POSTHOOK: query: insert into orc_partition
+values ('1', 'text1', 'part1')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part1
 POSTHOOK: Lineage: orc_partition PARTITION(c=part1).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part1).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('2', 'text2', 'part1')
+PREHOOK: query: insert into orc_partition
+values ('2', 'text2', 'part1')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('2', 'text2', 'part1')
+POSTHOOK: query: insert into orc_partition
+values ('2', 'text2', 'part1')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part1
 POSTHOOK: Lineage: orc_partition PARTITION(c=part1).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part1).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('3', 'text3', 'part2')
+PREHOOK: query: insert into orc_partition
+values ('3', 'text3', 'part2')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('3', 'text3', 'part2')
+POSTHOOK: query: insert into orc_partition
+values ('3', 'text3', 'part2')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part2
 POSTHOOK: Lineage: orc_partition PARTITION(c=part2).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part2).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('4', 'text4', 'part2')
+PREHOOK: query: insert into orc_partition
+values ('4', 'text4', 'part2')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('4', 'text4', 'part2')
+POSTHOOK: query: insert into orc_partition
+values ('4', 'text4', 'part2')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part2
 POSTHOOK: Lineage: orc_partition PARTITION(c=part2).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part2).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('5', 'text5', 'part3')
+PREHOOK: query: insert into orc_partition
+values ('5', 'text5', 'part3')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('5', 'text5', 'part3')
+POSTHOOK: query: insert into orc_partition
+values ('5', 'text5', 'part3')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part3
 POSTHOOK: Lineage: orc_partition PARTITION(c=part3).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part3).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('6', 'text6', 'part3')
+PREHOOK: query: insert into orc_partition
+values ('6', 'text6', 'part3')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('6', 'text6', 'part3')
+POSTHOOK: query: insert into orc_partition
+values ('6', 'text6', 'part3')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part3
 POSTHOOK: Lineage: orc_partition PARTITION(c=part3).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part3).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('7', 'text7', 'part4')
+PREHOOK: query: insert into orc_partition
+values ('7', 'text7', 'part4')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('7', 'text7', 'part4')
+POSTHOOK: query: insert into orc_partition
+values ('7', 'text7', 'part4')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part4
 POSTHOOK: Lineage: orc_partition PARTITION(c=part4).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part4).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('8', 'text8', 'part4')
+PREHOOK: query: insert into orc_partition
+values ('8', 'text8', 'part4')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('8', 'text8', 'part4')
+POSTHOOK: query: insert into orc_partition
+values ('8', 'text8', 'part4')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part4
 POSTHOOK: Lineage: orc_partition PARTITION(c=part4).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part4).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('9', 'text9', 'part5')
+PREHOOK: query: insert into orc_partition
+values ('9', 'text9', 'part5')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('9', 'text9', 'part5')
+POSTHOOK: query: insert into orc_partition
+values ('9', 'text9', 'part5')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
 POSTHOOK: Output: default@orc_partition@c=part5
 POSTHOOK: Lineage: orc_partition PARTITION(c=part5).a SCRIPT []
 POSTHOOK: Lineage: orc_partition PARTITION(c=part5).b SCRIPT []
-PREHOOK: query: insert into orc_partition values('10', 'text10', 'part5')
+PREHOOK: query: insert into orc_partition
+values ('10', 'text10', 'part5')
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 PREHOOK: Output: default@orc_partition
-POSTHOOK: query: insert into orc_partition values('10', 'text10', 'part5')
+POSTHOOK: query: insert into orc_partition
+values ('10', 'text10', 'part5')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 POSTHOOK: Output: default@orc_partition
@@ -142,7 +178,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
 PREHOOK: query: alter table orc_partition PARTITION (c='part1') compact 'MINOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition
@@ -215,4 +251,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_minor.q.out
index 76b0c7b1386..b760ba1b526 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_minor.q.out
@@ -67,4 +67,4 @@ POSTHOOK: Input: default@orc_table
 a                   	int                 	                    
 b                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
+Detailed Table Information	Table(tableName:orc_table, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:int, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSerde, pa [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned.q.out
index 870f9ad64fc..93ee252fd27 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned.q.out
@@ -142,7 +142,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
 PREHOOK: query: alter table orc_partition PARTITION (c='part1') compact 'MAJOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition
@@ -225,4 +225,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
diff --git a/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned_minor.q.out b/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned_minor.q.out
index 316339e3cfa..e23857f86fe 100644
--- a/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned_minor.q.out
+++ b/ql/src/test/results/clientpositive/llap/compaction_query_based_partitioned_minor.q.out
@@ -142,7 +142,7 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
 PREHOOK: query: alter table orc_partition PARTITION (c='part1') compact 'MINOR' and wait
 PREHOOK: type: ALTERTABLE_COMPACT
 PREHOOK: Input: default@orc_partition
@@ -225,4 +225,4 @@ c                   	string
 # col_name            	data_type           	comment             
 c                   	string              	                    
 	 	 
-Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
+Detailed Table Information	Table(tableName:orc_partition, dbName:default, #Masked# #Masked#, #Masked#, retention:0, sd:StorageDescriptor(cols:[FieldSchema(name:a, type:string, comment:null), FieldSchema(name:b, type:string, comment:null)], #Masked# inputFormat:org.apache.hadoop.hive.ql.io.orc.OrcInputFormat, outputFormat:org.apache.hadoop.hive.ql.io.orc.OrcOutputFormat, compressed:false, numBuckets:-1, serdeInfo:SerDeInfo(name:null, serializationLib:org.apache.hadoop.hive.ql.io.orc.OrcSe [...]
diff --git a/ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out b/ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out
index 91751cd390d..de578d55eef 100644
--- a/ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_alter_list_bucketing_table1.q.out
@@ -31,7 +31,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -79,7 +79,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -126,7 +126,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -180,7 +180,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -227,7 +227,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -273,7 +273,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -319,7 +319,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_like.q.out b/ql/src/test/results/clientpositive/llap/create_like.q.out
index c47ae30cc9d..c62989e094d 100644
--- a/ql/src/test/results/clientpositive/llap/create_like.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_like.q.out
@@ -28,7 +28,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -71,7 +71,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -123,7 +123,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -387,7 +387,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -431,7 +431,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -482,7 +482,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -525,7 +525,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -568,7 +568,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -678,7 +678,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_like2.q.out b/ql/src/test/results/clientpositive/llap/create_like2.q.out
index a1ddf846168..e83724c9235 100644
--- a/ql/src/test/results/clientpositive/llap/create_like2.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_like2.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -92,7 +92,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -143,7 +143,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -189,7 +189,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -238,7 +238,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -284,7 +284,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -415,7 +415,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out b/ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out
index 6de55c0e2ad..d2525feb244 100644
--- a/ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_like_tbl_props.q.out
@@ -29,7 +29,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -73,7 +73,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -118,7 +118,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -163,7 +163,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -220,7 +220,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_like_view.q.out b/ql/src/test/results/clientpositive/llap/create_like_view.q.out
index 8e7693bb996..55f6e94a7de 100644
--- a/ql/src/test/results/clientpositive/llap/create_like_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_like_view.q.out
@@ -58,7 +58,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -121,7 +121,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -179,7 +179,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -305,7 +305,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out b/ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out
index 7be2fa6a9a7..08550518088 100644
--- a/ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_or_replace_view.q.out
@@ -129,7 +129,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -225,7 +225,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -298,7 +298,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -396,7 +396,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out b/ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out
index 9654d9af649..183bb904e27 100644
--- a/ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_skewed_table1.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -81,7 +81,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -119,7 +119,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_table.q.out b/ql/src/test/results/clientpositive/llap/create_table.q.out
index 2cecd51cd10..ff94a674b6c 100644
--- a/ql/src/test/results/clientpositive/llap/create_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_table.q.out
@@ -51,7 +51,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -119,7 +119,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -187,7 +187,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -255,7 +255,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -321,7 +321,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -385,7 +385,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	1                   
-	totalSize           	2                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -446,7 +446,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out b/ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out
index ce31fe190ec..3db17ec54cd 100644
--- a/ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_table_like_stats.q.out
@@ -34,7 +34,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -86,7 +86,7 @@ Table Type:         	MANAGED_TABLE
 Table Parameters:	 	 
 	bucketing_version   	2                   
 	numFiles            	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -149,7 +149,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -208,7 +208,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out b/ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out
index 46aeaaaf4c5..fb6f7ec4230 100644
--- a/ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_transactional_full_acid.q.out
@@ -51,7 +51,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out b/ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out
index 664075c7048..309dee328fc 100644
--- a/ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_transactional_insert_only.q.out
@@ -39,7 +39,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out
index df2c86e16d4..275a5b97c4b 100644
--- a/ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_view_partitioned.q.out
@@ -70,7 +70,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -269,7 +269,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -384,7 +384,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_with_constraints.q.out b/ql/src/test/results/clientpositive/llap/create_with_constraints.q.out
index 606f17e8164..dca7dc37ae7 100644
--- a/ql/src/test/results/clientpositive/llap/create_with_constraints.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_with_constraints.q.out
@@ -461,7 +461,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -503,7 +503,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -544,7 +544,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -598,7 +598,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -658,7 +658,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -706,7 +706,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -757,7 +757,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -799,7 +799,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -841,7 +841,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -884,7 +884,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -934,7 +934,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -983,7 +983,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1030,7 +1030,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1073,7 +1073,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1116,7 +1116,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1151,7 +1151,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1186,7 +1186,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1233,7 +1233,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1276,7 +1276,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1324,7 +1324,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1371,7 +1371,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1415,7 +1415,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1584,7 +1584,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1618,7 +1618,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1666,7 +1666,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1715,7 +1715,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1757,7 +1757,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1792,7 +1792,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1831,7 +1831,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1914,7 +1914,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1955,7 +1955,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2009,7 +2009,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2060,7 +2060,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2104,7 +2104,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2143,7 +2143,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2204,7 +2204,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2255,7 +2255,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2310,7 +2310,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2391,7 +2391,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2458,7 +2458,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2509,7 +2509,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2565,7 +2565,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2647,7 +2647,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2725,7 +2725,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	26                  
-	totalSize           	27                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out b/ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out
index 0129f9a0aaf..c5fb36431f0 100644
--- a/ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out
+++ b/ql/src/test/results/clientpositive/llap/create_with_constraints2.q.out
@@ -58,7 +58,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -100,7 +100,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/ctas.q.out b/ql/src/test/results/clientpositive/llap/ctas.q.out
index 20d587cfa1b..0350019155c 100644
--- a/ql/src/test/results/clientpositive/llap/ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas.q.out
@@ -214,7 +214,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
-	totalSize           	106                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -427,7 +427,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
-	totalSize           	106                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -640,7 +640,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -704,7 +704,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	120                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -918,7 +918,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	10                  
 	rawDataSize         	96                  
-	totalSize           	106                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/ctas_colname.q.out b/ql/src/test/results/clientpositive/llap/ctas_colname.q.out
index 52b24b60c63..5e226afea2c 100644
--- a/ql/src/test/results/clientpositive/llap/ctas_colname.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas_colname.q.out
@@ -162,7 +162,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	620                 
-	totalSize           	640                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -380,7 +380,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	25                  
 	rawDataSize         	242                 
-	totalSize           	267                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -623,7 +623,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	20                  
 	rawDataSize         	268                 
-	totalSize           	288                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -806,7 +806,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	25                  
 	rawDataSize         	309                 
-	totalSize           	334                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1018,7 +1018,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	3891                
-	totalSize           	4200                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1514,7 +1514,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	5                   
 	rawDataSize         	45                  
-	totalSize           	50                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1711,7 +1711,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	5                   
 	rawDataSize         	35                  
-	totalSize           	40                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/ctas_translate_external.q.out b/ql/src/test/results/clientpositive/llap/ctas_translate_external.q.out
index f9b9af86158..af3adf4a148 100644
--- a/ql/src/test/results/clientpositive/llap/ctas_translate_external.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas_translate_external.q.out
@@ -33,7 +33,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	19                  
-	totalSize           	20                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -81,7 +81,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	19                  
-	totalSize           	20                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/ctas_uses_database_location.q.out b/ql/src/test/results/clientpositive/llap/ctas_uses_database_location.q.out
index 7684c8298bc..ef253a0809a 100644
--- a/ql/src/test/results/clientpositive/llap/ctas_uses_database_location.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctas_uses_database_location.q.out
@@ -152,7 +152,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/ctlt_translate_external.q.out b/ql/src/test/results/clientpositive/llap/ctlt_translate_external.q.out
index a5b6b69fa3e..96df4bdad6c 100644
--- a/ql/src/test/results/clientpositive/llap/ctlt_translate_external.q.out
+++ b/ql/src/test/results/clientpositive/llap/ctlt_translate_external.q.out
@@ -41,7 +41,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -93,7 +93,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/database_default_table_type.q.out b/ql/src/test/results/clientpositive/llap/database_default_table_type.q.out
index 7f6b816922f..30569a7804a 100644
--- a/ql/src/test/results/clientpositive/llap/database_default_table_type.q.out
+++ b/ql/src/test/results/clientpositive/llap/database_default_table_type.q.out
@@ -44,7 +44,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -87,7 +87,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -130,7 +130,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -173,7 +173,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -220,7 +220,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -264,7 +264,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -308,7 +308,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -352,7 +352,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -400,7 +400,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -459,7 +459,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -509,7 +509,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/database_location.q.out b/ql/src/test/results/clientpositive/llap/database_location.q.out
index d0bd47f1b7d..49821dadb1b 100644
--- a/ql/src/test/results/clientpositive/llap/database_location.q.out
+++ b/ql/src/test/results/clientpositive/llap/database_location.q.out
@@ -47,7 +47,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -122,7 +122,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/decimal_serde.q.out b/ql/src/test/results/clientpositive/llap/decimal_serde.q.out
index 2460aa6a39f..c473dd3023f 100644
--- a/ql/src/test/results/clientpositive/llap/decimal_serde.q.out
+++ b/ql/src/test/results/clientpositive/llap/decimal_serde.q.out
@@ -128,7 +128,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	38                  
 	rawDataSize         	157                 
-	totalSize           	278                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -181,7 +181,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	38                  
 	rawDataSize         	157                 
-	totalSize           	278                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/default_constraint.q.out b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
index d9ef1a994a6..01139354e49 100644
--- a/ql/src/test/results/clientpositive/llap/default_constraint.q.out
+++ b/ql/src/test/results/clientpositive/llap/default_constraint.q.out
@@ -1566,7 +1566,7 @@ Table Type:         	MANAGED_TABLE
 Table Parameters:	 	 
 	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1740,7 +1740,7 @@ Table Parameters:
 	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1818,7 +1818,7 @@ Table Parameters:
 	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2003,7 +2003,7 @@ Table Parameters:
 	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2084,7 +2084,7 @@ Table Parameters:
 	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2162,7 +2162,7 @@ Table Parameters:
 	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2772,7 +2772,7 @@ Table Type:         	MANAGED_TABLE
 Table Parameters:	 	 
 	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/default_file_format.q.out b/ql/src/test/results/clientpositive/llap/default_file_format.q.out
index bb37f6188d8..55b75397454 100644
--- a/ql/src/test/results/clientpositive/llap/default_file_format.q.out
+++ b/ql/src/test/results/clientpositive/llap/default_file_format.q.out
@@ -73,7 +73,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -107,7 +107,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -141,7 +141,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -176,7 +176,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -210,7 +210,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -245,7 +245,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -393,7 +393,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -427,7 +427,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -461,7 +461,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -496,7 +496,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -530,7 +530,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -565,7 +565,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
index 3b8bc17eb8b..5068a86de52 100644
--- a/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/deleteAnalyze.q.out
@@ -54,7 +54,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	634                 
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -121,7 +121,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out b/ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out
index 36c14c10415..f7c9d8071ee 100644
--- a/ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_comment_indent.q.out
@@ -62,7 +62,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out b/ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out
index 8bf2019cda5..0f747d735e5 100644
--- a/ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_comment_nonascii.q.out
@@ -54,7 +54,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out
index fe96d50601f..28f1876338b 100644
--- a/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_formatted_view_partitioned.q.out
@@ -59,7 +59,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 PREHOOK: query: DROP VIEW view_partitioned
 PREHOOK: type: DROPVIEW
diff --git a/ql/src/test/results/clientpositive/llap/describe_syntax.q.out b/ql/src/test/results/clientpositive/llap/describe_syntax.q.out
index 86d4f3c417f..e1c9dfb6318 100644
--- a/ql/src/test/results/clientpositive/llap/describe_syntax.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_syntax.q.out
@@ -99,7 +99,7 @@ Table Parameters:
 	numPartitions       	3                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -172,7 +172,7 @@ Table Parameters:
 	numPartitions       	3                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -341,7 +341,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -411,7 +411,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/describe_table.q.out b/ql/src/test/results/clientpositive/llap/describe_table.q.out
index 7b29184b097..44f4728d39d 100644
--- a/ql/src/test/results/clientpositive/llap/describe_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/describe_table.q.out
@@ -182,7 +182,7 @@ Table Parameters:
 	numPartitions       	4                   
 	numRows             	2000                
 	rawDataSize         	21248               
-	totalSize           	23248               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -239,7 +239,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -280,7 +280,7 @@ Table Parameters:
 	numPartitions       	4                   
 	numRows             	2000                
 	rawDataSize         	21248               
-	totalSize           	23248               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -337,7 +337,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -457,7 +457,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -565,7 +565,7 @@ Table Parameters:
 	numPartitions       	3                   
 	numRows             	3                   
 	rawDataSize         	3                   
-	totalSize           	6                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out b/ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out
index 01795fb5dc8..cdc05d1177d 100644
--- a/ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out
+++ b/ql/src/test/results/clientpositive/llap/drop_partitions_filter.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
       db name: default
       partitions:
           Partition
-            params: {totalSize=0, numRows=0, rawDataSize=0, COLUMN_STATS_ACCURATE={"BASIC_STATS":"true","COLUMN_STATS":{"a":"true","b":"true"}}, numFiles=0, numFilesErasureCoded=0}
+            params: {totalSize=#Masked#, numRows=0, rawDataSize=0, COLUMN_STATS_ACCURATE={"BASIC_STATS":"true","COLUMN_STATS":{"a":"true","b":"true"}}, numFiles=0, numFilesErasureCoded=0}
             partition spec: {c=US, d=1}
       table name: ptestfilter_n1
 
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
index c0a00d0b60b..ef967a20ffe 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_opt_vectorization.q.out
@@ -1362,7 +1362,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	1446                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1402,7 +1402,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	1150                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1442,7 +1442,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	14                  
 	rawDataSize         	280                 
-	totalSize           	1264                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1482,7 +1482,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	1150                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1521,7 +1521,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	4712                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1560,7 +1560,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	2110                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1599,7 +1599,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	640                 
-	totalSize           	4730                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1638,7 +1638,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	6                   
 	rawDataSize         	120                 
-	totalSize           	2110                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2430,7 +2430,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2470,7 +2470,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2571,7 +2571,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2611,7 +2611,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2978,7 +2978,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3017,7 +3017,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3211,7 +3211,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3250,7 +3250,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
index 30dad66ed85..9e2fad62961 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization.q.out
@@ -1291,7 +1291,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	32                  
 	rawDataSize         	830                 
-	totalSize           	862                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1331,7 +1331,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	156                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1371,7 +1371,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	14                  
 	rawDataSize         	362                 
-	totalSize           	376                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1411,7 +1411,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	6                   
 	rawDataSize         	156                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1450,7 +1450,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	830                 
-	totalSize           	862                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1489,7 +1489,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	6                   
 	rawDataSize         	156                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1528,7 +1528,7 @@ Partition Parameters:
 	numFiles            	8                   
 	numRows             	32                  
 	rawDataSize         	830                 
-	totalSize           	862                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1567,7 +1567,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	6                   
 	rawDataSize         	156                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2359,7 +2359,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2399,7 +2399,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2500,7 +2500,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2540,7 +2540,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2907,7 +2907,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2946,7 +2946,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3047,7 +3047,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	415                 
-	totalSize           	431                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3086,7 +3086,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	78                  
-	totalSize           	81                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
index 1190c8feb1d..b9cf01811e1 100644
--- a/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
+++ b/ql/src/test/results/clientpositive/llap/dynpart_sort_optimization2.q.out
@@ -246,7 +246,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	151                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -304,7 +304,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	186                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -510,7 +510,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	151                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -568,7 +568,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	186                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -788,7 +788,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	151                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -846,7 +846,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	186                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1048,7 +1048,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	151                 
-	totalSize           	162                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1106,7 +1106,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	186                 
-	totalSize           	199                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1385,7 +1385,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	88                  
-	totalSize           	473                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1443,7 +1443,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	104                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1645,7 +1645,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	11                  
 	rawDataSize         	88                  
-	totalSize           	473                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1703,7 +1703,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	13                  
 	rawDataSize         	104                 
-	totalSize           	496                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/empty_result_ctas.q.out b/ql/src/test/results/clientpositive/llap/empty_result_ctas.q.out
index 27eba3c3b62..45a9ca03ed3 100644
--- a/ql/src/test/results/clientpositive/llap/empty_result_ctas.q.out
+++ b/ql/src/test/results/clientpositive/llap/empty_result_ctas.q.out
@@ -46,7 +46,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -97,7 +97,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -166,7 +166,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out b/ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out
index 93c88ac5b8d..5314aceec0d 100644
--- a/ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out
+++ b/ql/src/test/results/clientpositive/llap/exim_hidden_files.q.out
@@ -80,7 +80,7 @@ Table Parameters:
 	numPartitions       	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	11                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/external_insert.q.out b/ql/src/test/results/clientpositive/llap/external_insert.q.out
index bdd5a426d0f..26ad9f7f136 100644
--- a/ql/src/test/results/clientpositive/llap/external_insert.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_insert.q.out
@@ -85,7 +85,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -145,7 +145,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1                   
 	rawDataSize         	3                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out b/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
index 4fa4c06f07b..6cb4f73652c 100644
--- a/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
+++ b/ql/src/test/results/clientpositive/llap/external_jdbc_rowcount.q.out
@@ -6,57 +6,57 @@ POSTHOOK: type: CREATEFUNCTION
 POSTHOOK: Output: dboutput
 PREHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE11 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' )
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE1 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE11 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE)' )
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 0
 PREHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE2 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE12 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' )
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE2 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE12 ("ikey" INTEGER, "bkey" BIGINT, "fkey" REAL, "dkey" DOUBLE, "datekey" DATE)' )
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 0
 PREHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE3 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE13 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' )
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE3 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE13 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE)' )
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 0
 PREHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE4 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE14 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' )
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT
 #### A masked pattern was here ####
-'CREATE TABLE SIMPLE_DERBY_TABLE4 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' )
+'CREATE TABLE SIMPLE_DERBY_TABLE14 ("ikey2" INTEGER, "bkey2" BIGINT, "fkey2" REAL, "dkey2" DOUBLE, "datekey2" DATE)' )
 POSTHOOK: type: QUERY
 POSTHOOK: Input: _dummy_database@_dummy_table
 #### A masked pattern was here ####
 0
-PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table1
+PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table11
 (
  ikey int,
  bkey bigint,
@@ -70,13 +70,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE1",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE11",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-PREHOOK: Output: default@ext_simple_derby_table1
-POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table1
+PREHOOK: Output: default@ext_simple_derby_table11
+POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table11
 (
  ikey int,
  bkey bigint,
@@ -90,13 +90,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE1",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE11",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
-POSTHOOK: Output: default@ext_simple_derby_table1
-PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table2
+POSTHOOK: Output: default@ext_simple_derby_table11
+PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table12
 (
  ikey int,
  bkey bigint,
@@ -111,13 +111,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE2",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE12",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-PREHOOK: Output: default@ext_simple_derby_table2
-POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table2
+PREHOOK: Output: default@ext_simple_derby_table12
+POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table12
 (
  ikey int,
  bkey bigint,
@@ -132,13 +132,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE2",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE12",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
-POSTHOOK: Output: default@ext_simple_derby_table2
-PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table3
+POSTHOOK: Output: default@ext_simple_derby_table12
+PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table13
 (
  ikey2 int,
  bkey2 bigint,
@@ -152,13 +152,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE3",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE13",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-PREHOOK: Output: default@ext_simple_derby_table3
-POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table3
+PREHOOK: Output: default@ext_simple_derby_table13
+POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table13
 (
  ikey2 int,
  bkey2 bigint,
@@ -172,13 +172,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE3",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE13",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
-POSTHOOK: Output: default@ext_simple_derby_table3
-PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table4
+POSTHOOK: Output: default@ext_simple_derby_table13
+PREHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table14
 (
  ikey2 int,
  bkey2 bigint,
@@ -193,13 +193,13 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE4",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE14",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
-PREHOOK: Output: default@ext_simple_derby_table4
-POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table4
+PREHOOK: Output: default@ext_simple_derby_table14
+POSTHOOK: query: CREATE EXTERNAL TABLE ext_simple_derby_table14
 (
  ikey2 int,
  bkey2 bigint,
@@ -214,20 +214,20 @@ TBLPROPERTIES (
 #### A masked pattern was here ####
                 "hive.sql.dbcp.username" = "APP",
                 "hive.sql.dbcp.password" = "mine",
-                "hive.sql.table" = "SIMPLE_DERBY_TABLE4",
+                "hive.sql.table" = "SIMPLE_DERBY_TABLE14",
                 "hive.sql.dbcp.maxActive" = "1"
 )
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
-POSTHOOK: Output: default@ext_simple_derby_table4
+POSTHOOK: Output: default@ext_simple_derby_table14
 PREHOOK: query: explain cbo
 with t1 as (select fkey, ikey, sum(dkey) as dk_sum, sum(dkey2) as dk2_sum
-            from ext_simple_derby_table1 left join ext_simple_derby_table3
+            from ext_simple_derby_table11 left join ext_simple_derby_table13
             on ikey = ikey2
             where fkey2 is null
             group by fkey, ikey),
 t2 as (select datekey, fkey, ikey, sum(dkey) as dk_sum2, sum(dkey2) as dk2_sum2
-       from ext_simple_derby_table2 left join ext_simple_derby_table4
+       from ext_simple_derby_table12 left join ext_simple_derby_table14
        on ikey = ikey2
        where fkey2 is null
        group by datekey, fkey, ikey)
@@ -237,19 +237,19 @@ on t1.ikey = t2.ikey AND t1.fkey = t2.fkey
 where t2.fkey is null
 group by t2.datekey, t1.fkey, t2.ikey
 PREHOOK: type: QUERY
-PREHOOK: Input: default@ext_simple_derby_table1
-PREHOOK: Input: default@ext_simple_derby_table2
-PREHOOK: Input: default@ext_simple_derby_table3
-PREHOOK: Input: default@ext_simple_derby_table4
+PREHOOK: Input: default@ext_simple_derby_table11
+PREHOOK: Input: default@ext_simple_derby_table12
+PREHOOK: Input: default@ext_simple_derby_table13
+PREHOOK: Input: default@ext_simple_derby_table14
 #### A masked pattern was here ####
 POSTHOOK: query: explain cbo
 with t1 as (select fkey, ikey, sum(dkey) as dk_sum, sum(dkey2) as dk2_sum
-            from ext_simple_derby_table1 left join ext_simple_derby_table3
+            from ext_simple_derby_table11 left join ext_simple_derby_table13
             on ikey = ikey2
             where fkey2 is null
             group by fkey, ikey),
 t2 as (select datekey, fkey, ikey, sum(dkey) as dk_sum2, sum(dkey2) as dk2_sum2
-       from ext_simple_derby_table2 left join ext_simple_derby_table4
+       from ext_simple_derby_table12 left join ext_simple_derby_table14
        on ikey = ikey2
        where fkey2 is null
        group by datekey, fkey, ikey)
@@ -259,10 +259,10 @@ on t1.ikey = t2.ikey AND t1.fkey = t2.fkey
 where t2.fkey is null
 group by t2.datekey, t1.fkey, t2.ikey
 POSTHOOK: type: QUERY
-POSTHOOK: Input: default@ext_simple_derby_table1
-POSTHOOK: Input: default@ext_simple_derby_table2
-POSTHOOK: Input: default@ext_simple_derby_table3
-POSTHOOK: Input: default@ext_simple_derby_table4
+POSTHOOK: Input: default@ext_simple_derby_table11
+POSTHOOK: Input: default@ext_simple_derby_table12
+POSTHOOK: Input: default@ext_simple_derby_table13
+POSTHOOK: Input: default@ext_simple_derby_table14
 #### A masked pattern was here ####
 CBO PLAN:
 HiveJdbcConverter(convention=[JDBC.DERBY])
@@ -274,18 +274,18 @@ HiveJdbcConverter(convention=[JDBC.DERBY])
             JdbcAggregate(group=[{0, 2}])
               JdbcFilter(condition=[IS NULL($6)])
                 JdbcJoin(condition=[=($0, $4)], joinType=[left])
-                  JdbcHiveTableScan(table=[[default, ext_simple_derby_table1]], table:alias=[ext_simple_derby_table1])
+                  JdbcHiveTableScan(table=[[default, ext_simple_derby_table11]], table:alias=[ext_simple_derby_table11])
                   HiveProject(ikey2=[$0], bkey2=[$1], fkey2=[$2], dkey2=[$3])
                     JdbcFilter(condition=[IS NOT NULL($0)])
-                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table3]], table:alias=[ext_simple_derby_table3])
+                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table13]], table:alias=[ext_simple_derby_table13])
           JdbcProject(datekey=[$2], fkey=[$1], ikey=[$0])
             JdbcAggregate(group=[{0, 2, 4}])
               JdbcFilter(condition=[IS NULL($7)])
                 JdbcJoin(condition=[=($0, $5)], joinType=[left])
                   HiveProject(ikey=[$0], bkey=[$1], fkey=[$2], dkey=[$3], datekey=[$4])
                     JdbcFilter(condition=[AND(IS NOT NULL($0), IS NOT NULL($2))])
-                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table2]], table:alias=[ext_simple_derby_table2])
+                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table12]], table:alias=[ext_simple_derby_table12])
                   HiveProject(ikey2=[$0], bkey2=[$1], fkey2=[$2], dkey2=[$3], datekey2=[$4])
                     JdbcFilter(condition=[IS NOT NULL($0)])
-                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table4]], table:alias=[ext_simple_derby_table4])
+                      JdbcHiveTableScan(table=[[default, ext_simple_derby_table14]], table:alias=[ext_simple_derby_table14])
 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
index ac58737fbf2..8c7e3684ad1 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_bucketed_table.q.out
@@ -44,7 +44,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_convert_join.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_convert_join.q.out
index 78207056801..9f98998b0ad 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_convert_join.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_convert_join.q.out
@@ -42,7 +42,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -91,7 +91,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_dyn_part.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_dyn_part.q.out
index 45c99f5f461..995733564a0 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_dyn_part.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_dyn_part.q.out
@@ -61,7 +61,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	4812                
-	totalSize           	5293                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -99,7 +99,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	4812                
-	totalSize           	5293                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -161,7 +161,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1173                
-	totalSize           	1427                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -199,7 +199,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1173                
-	totalSize           	1429                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -263,7 +263,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	155                 
 	rawDataSize         	586                 
-	totalSize           	796                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -301,7 +301,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	154                 
 	rawDataSize         	591                 
-	totalSize           	798                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -595,7 +595,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	4                   
 	rawDataSize         	14                  
-	totalSize           	94                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -633,7 +633,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	305                 
 	rawDataSize         	1163                
-	totalSize           	1428                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_grouping_operators.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_grouping_operators.q.out
index bf266405f38..ac8400c02c8 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_grouping_operators.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_grouping_operators.q.out
@@ -814,7 +814,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	619                 
 	rawDataSize         	6309                
-	totalSize           	6928                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1494,7 +1494,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	619                 
 	rawDataSize         	7547                
-	totalSize           	8166                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1680,7 +1680,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	928                 
 	rawDataSize         	9954                
-	totalSize           	10882               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1733,7 +1733,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	928                 
 	rawDataSize         	11810               
-	totalSize           	12738               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1919,7 +1919,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	618                 
 	rawDataSize         	6054                
-	totalSize           	6672                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1972,7 +1972,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	618                 
 	rawDataSize         	7290                
-	totalSize           	7908                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_list_bucket.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_list_bucket.q.out
index 44d10baac40..445d6ef159b 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_list_bucket.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_list_bucket.q.out
@@ -48,7 +48,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -116,7 +116,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_map_operators.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_map_operators.q.out
index ed64c830d9c..44d2dd7ef3b 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_map_operators.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_map_operators.q.out
@@ -197,7 +197,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -434,7 +434,7 @@ Partition Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -612,7 +612,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -818,7 +818,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	2728                
-	totalSize           	3037                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_merge.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_merge.q.out
index 38227454f1c..63934ec9b79 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_merge.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_merge.q.out
@@ -42,7 +42,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -91,7 +91,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_multi_insert.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_multi_insert.q.out
index bc8f153166b..1c505f64309 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_multi_insert.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_multi_insert.q.out
@@ -48,7 +48,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -85,7 +85,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -140,7 +140,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -177,7 +177,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	2718                
-	totalSize           	3027                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -232,7 +232,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -269,7 +269,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -324,7 +324,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -361,7 +361,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	309                 
 	rawDataSize         	2690                
-	totalSize           	2999                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_num_buckets.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_num_buckets.q.out
index 490a5ed2a28..9cb5fab2e72 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_num_buckets.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_num_buckets.q.out
@@ -356,7 +356,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	670                 
 	rawDataSize         	5888                
-	totalSize           	6558                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -394,7 +394,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	330                 
 	rawDataSize         	2924                
-	totalSize           	3254                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_reducers_power_two.q.out b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_reducers_power_two.q.out
index 8fc026cce82..5500130ac95 100644
--- a/ql/src/test/results/clientpositive/llap/infer_bucket_sort_reducers_power_two.q.out
+++ b/ql/src/test/results/clientpositive/llap/infer_bucket_sort_reducers_power_two.q.out
@@ -42,7 +42,7 @@ Partition Parameters:
 	numFiles            	13                  
 	numRows             	309                 
 	rawDataSize         	1482                
-	totalSize           	1791                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -91,7 +91,7 @@ Partition Parameters:
 	numFiles            	53                  
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -140,7 +140,7 @@ Partition Parameters:
 	numFiles            	71                  
 	numRows             	1028                
 	rawDataSize         	10968               
-	totalSize           	11996               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -189,7 +189,7 @@ Partition Parameters:
 	numFiles            	88                  
 	numRows             	2654                
 	rawDataSize         	28466               
-	totalSize           	31120               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -238,7 +238,7 @@ Partition Parameters:
 	numFiles            	74                  
 	numRows             	2654                
 	rawDataSize         	28466               
-	totalSize           	31120               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -287,7 +287,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	5                   
 	rawDataSize         	19                  
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/insert_only_to_acid_convert.q.out b/ql/src/test/results/clientpositive/llap/insert_only_to_acid_convert.q.out
index 596b65c3b3b..2fb47c4cdfb 100644
--- a/ql/src/test/results/clientpositive/llap/insert_only_to_acid_convert.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_only_to_acid_convert.q.out
@@ -38,7 +38,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	182                 
-	totalSize           	317                 
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -83,7 +83,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	182                 
-	totalSize           	317                 
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -158,7 +158,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	182                 
-	totalSize           	317                 
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -203,7 +203,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	182                 
-	totalSize           	317                 
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -295,7 +295,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	20                  
 	rawDataSize         	2008                
-	totalSize           	1948                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -346,7 +346,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	20                  
 	rawDataSize         	2008                
-	totalSize           	1948                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
index cc838125f22..7c0ebcf1c71 100644
--- a/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
+++ b/ql/src/test/results/clientpositive/llap/insert_values_orig_table_use_metadata.q.out
@@ -108,7 +108,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -173,7 +173,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	12288               
 	rawDataSize         	0                   
-	totalSize           	309572              
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -344,7 +344,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	1673                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -440,7 +440,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	4                   
 	rawDataSize         	0                   
-	totalSize           	3346                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -532,7 +532,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	12292               
 	rawDataSize         	0                   
-	totalSize           	312919              
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -603,7 +603,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -648,7 +648,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -735,7 +735,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -860,7 +860,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	5820                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -910,7 +910,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	502                 
 	rawDataSize         	5318                
-	totalSize           	5820                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out b/ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out
index ac4f7b55b44..6a34ef3725c 100644
--- a/ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/lb_fs_stats.q.out
@@ -48,7 +48,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	4812                
-	totalSize           	5370                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_1.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_1.q.out
index 443a8538d51..76b97421eb6 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_1.q.out
@@ -306,7 +306,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -349,7 +349,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
index a741d3c52d5..b7bd1ae5bec 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_10.q.out
@@ -264,7 +264,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	4812                
-	totalSize           	5520                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_11.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_11.q.out
index fa563439286..8b414ab1009 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_11.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_11.q.out
@@ -264,7 +264,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	4812                
-	totalSize           	5522                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_12.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_12.q.out
index 63dc93e8d01..30311b32781 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_12.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_12.q.out
@@ -270,7 +270,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	6312                
-	totalSize           	7094                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_13.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_13.q.out
index c30c1013821..cf9d671e5fc 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_13.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_13.q.out
@@ -270,7 +270,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	500                 
 	rawDataSize         	6312                
-	totalSize           	7094                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_14.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_14.q.out
index e01cc02207e..6f2e0292b54 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_14.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_14.q.out
@@ -234,7 +234,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_2.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_2.q.out
index 96ba56e6291..a6f57194bc0 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_2.q.out
@@ -317,7 +317,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1000                
 	rawDataSize         	9624                
-	totalSize           	10659               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_3.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_3.q.out
index 2b1a19ab83e..5e554e8faa6 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_3.q.out
@@ -298,7 +298,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	1000                
 	rawDataSize         	10624               
-	totalSize           	11624               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_4.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_4.q.out
index 998606fabb6..e6b742e4b22 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_4.q.out
@@ -317,7 +317,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1000                
 	rawDataSize         	9624                
-	totalSize           	10659               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -638,7 +638,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1000                
 	rawDataSize         	9624                
-	totalSize           	10659               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_5.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_5.q.out
index 510e6b228f5..65fdf516254 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_5.q.out
@@ -306,7 +306,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -349,7 +349,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out
index 4bdc9064295..71dfac0b19d 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_6.q.out
@@ -320,7 +320,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	136                 
-	totalSize           	235                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -361,7 +361,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10495               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -685,7 +685,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	136                 
-	totalSize           	235                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -726,7 +726,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10495               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out
index de25cf5c4c3..5d3417aadb5 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_7.q.out
@@ -320,7 +320,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	136                 
-	totalSize           	235                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -361,7 +361,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10416               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -685,7 +685,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	16                  
 	rawDataSize         	136                 
-	totalSize           	235                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -726,7 +726,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	984                 
 	rawDataSize         	9488                
-	totalSize           	10416               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_dml_9.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_dml_9.q.out
index 9656b62aae0..33b120cb4c6 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_dml_9.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_dml_9.q.out
@@ -317,7 +317,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1000                
 	rawDataSize         	9624                
-	totalSize           	10659               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -638,7 +638,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	1000                
 	rawDataSize         	9624                
-	totalSize           	10659               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_1.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_1.q.out
index 6c00c57c802..77c46de35bf 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_1.q.out
@@ -49,7 +49,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_2.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_2.q.out
index cefeb378e11..4c2ceb9c0b8 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_2.q.out
@@ -49,7 +49,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_3.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_3.q.out
index ef75861d451..3655619911c 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_multiskew_3.q.out
@@ -45,7 +45,7 @@ Partition Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -103,7 +103,7 @@ Partition Parameters:
 	numFiles            	3                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -166,7 +166,7 @@ Partition Parameters:
 	numFiles            	2                   
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_1.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_1.q.out
index d685959ceea..1f6823d4e8d 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_1.q.out
@@ -99,7 +99,7 @@ Table:              	fact_daily_n4
 Partition Parameters:	 	 
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	8                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_2.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_2.q.out
index 61f80d8fda0..55bb4c37faa 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_2.q.out
@@ -102,7 +102,7 @@ Table:              	fact_daily_n5
 Partition Parameters:	 	 
 #### A masked pattern was here ####
 	numFiles            	2                   
-	totalSize           	24                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_3.q.out b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_3.q.out
index 106050b5b9a..64bb54f6589 100644
--- a/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/list_bucket_query_oneskew_3.q.out
@@ -118,7 +118,7 @@ Table:              	fact_daily_n0
 Partition Parameters:	 	 
 #### A masked pattern was here ####
 	numFiles            	3                   
-	totalSize           	117                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/load_micromanaged_delim.q.out b/ql/src/test/results/clientpositive/llap/load_micromanaged_delim.q.out
index 85bb1d00226..76cd222b033 100644
--- a/ql/src/test/results/clientpositive/llap/load_micromanaged_delim.q.out
+++ b/ql/src/test/results/clientpositive/llap/load_micromanaged_delim.q.out
@@ -29,7 +29,7 @@ Table Parameters:
 	EXTERNAL            	TRUE                
 	bucketing_version   	2                   
 	numFiles            	1                   
-	totalSize           	52                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -94,7 +94,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	52                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -161,7 +161,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	52                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/masking_mv.q.out b/ql/src/test/results/clientpositive/llap/masking_mv.q.out
index 312a16f452c..5f5ccb76307 100644
--- a/ql/src/test/results/clientpositive/llap/masking_mv.q.out
+++ b/ql/src/test/results/clientpositive/llap/masking_mv.q.out
@@ -160,7 +160,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	2000                
-	totalSize           	983                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -862,7 +862,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	2000                
-	totalSize           	983                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/masking_mv_by_text.q.out b/ql/src/test/results/clientpositive/llap/masking_mv_by_text.q.out
index 8261a8e6d79..371df642b87 100644
--- a/ql/src/test/results/clientpositive/llap/masking_mv_by_text.q.out
+++ b/ql/src/test/results/clientpositive/llap/masking_mv_by_text.q.out
@@ -160,7 +160,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	2000                
-	totalSize           	983                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_cluster.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_cluster.q.out
index d681a40ee10..c4d0e7f8230 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_cluster.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_cluster.q.out
@@ -185,7 +185,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	55                  
 	rawDataSize         	605                 
-	totalSize           	660                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -986,7 +986,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	57                  
 	rawDataSize         	1316                
-	totalSize           	1373                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1392,7 +1392,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	58                  
 	rawDataSize         	1342                
-	totalSize           	1400                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
index a3aa317cc3a..7fc8ce954ee 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create.q.out
@@ -53,7 +53,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1025                
-	totalSize           	516                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -121,7 +121,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	580                 
-	totalSize           	362                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -273,7 +273,7 @@ numFiles	1
 numFilesErasureCoded	0
 numRows	5
 rawDataSize	1605
-totalSize	732
+totalSize	#Masked#
 #### A masked pattern was here ####
 PREHOOK: query: drop materialized view cmv_mat_view_n4
 PREHOOK: type: DROP_MATERIALIZED_VIEW
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out
index 45ecb0fb601..912a5d9058a 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_acid.q.out
@@ -55,7 +55,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
index ac0eb35cb90..00a9101fb26 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_4.q.out
@@ -296,7 +296,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -540,7 +540,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1099,7 +1099,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1415,7 +1415,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -1725,7 +1725,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -2211,7 +2211,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	3                   
 	rawDataSize         	0                   
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
index 1b06d867b39..bb85ddc371d 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_5.q.out
@@ -404,7 +404,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	10                  
 	rawDataSize         	0                   
-	totalSize           	1522                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
index 889a80675ff..29e81b1302a 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window.q.out
@@ -290,7 +290,7 @@ Table Parameters:
 	numRows             	2                   
 	rawDataSize         	232                 
 	rewriting.time.window	5min                
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -529,7 +529,7 @@ Table Parameters:
 	numRows             	2                   
 	rawDataSize         	232                 
 	rewriting.time.window	5min                
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -873,7 +873,7 @@ Table Parameters:
 	numRows             	3                   
 	rawDataSize         	348                 
 	rewriting.time.window	5min                
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out
index 52a9775ec75..b3652e1360f 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_create_rewrite_time_window_2.q.out
@@ -96,7 +96,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	232                 
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -160,7 +160,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	2                   
 	rawDataSize         	232                 
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -224,7 +224,7 @@ Table Parameters:
 	numFiles            	2                   
 	numRows             	3                   
 	rawDataSize         	348                 
-	totalSize           	#Masked#                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
index ceda4383357..ea3309746a3 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_describe.q.out
@@ -75,7 +75,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	580                 
-	totalSize           	362                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -108,7 +108,7 @@ numFiles	1
 numFilesErasureCoded	0
 numRows	5
 rawDataSize	580
-totalSize	362
+totalSize	#Masked#
 #### A masked pattern was here ####
 PREHOOK: query: select a, c from cmv_mat_view_n8
 PREHOOK: type: QUERY
@@ -172,7 +172,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	5                   
-	totalSize           	10                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -259,7 +259,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	1025                
-	totalSize           	516                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -355,7 +355,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	5                   
 	rawDataSize         	5                   
-	totalSize           	10                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_distribute_sort.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_distribute_sort.q.out
index 93e729407a5..50dd242f699 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_distribute_sort.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_distribute_sort.q.out
@@ -185,7 +185,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	55                  
 	rawDataSize         	605                 
-	totalSize           	660                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -473,7 +473,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	55                  
 	rawDataSize         	605                 
-	totalSize           	660                 
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1023,7 +1023,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	117                 
 	rawDataSize         	1291                
-	totalSize           	1408                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
index e1bead7a234..9562550c0f7 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_parquet.q.out
@@ -200,7 +200,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	3                   
 	rawDataSize         	279                 
-	totalSize           	#Masked#                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_partition_cluster.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_partition_cluster.q.out
index e8f64995a16..b2c65375475 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_partition_cluster.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_partition_cluster.q.out
@@ -301,7 +301,7 @@ Table Parameters:
 	numPartitions       	32                  
 	numRows             	55                  
 	rawDataSize         	9790                
-	totalSize           	11094               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1828,7 +1828,7 @@ Table Parameters:
 	numPartitions       	32                  
 	numRows             	57                  
 	rawDataSize         	11062               
-	totalSize           	17390               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -2629,7 +2629,7 @@ Table Parameters:
 	numPartitions       	32                  
 	numRows             	58                  
 	rawDataSize         	11257               
-	totalSize           	17393               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
index 7f0ce1129b9..11dde3c0bd2 100644
--- a/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/materialized_view_partitioned.q.out
@@ -263,7 +263,7 @@ Table Parameters:
 	numPartitions       	32                  
 	numRows             	55                  
 	rawDataSize         	5005                
-	totalSize           	7906                
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/merge3.q.out b/ql/src/test/results/clientpositive/llap/merge3.q.out
index 27dd234439c..838b87a05b7 100644
--- a/ql/src/test/results/clientpositive/llap/merge3.q.out
+++ b/ql/src/test/results/clientpositive/llap/merge3.q.out
@@ -2281,7 +2281,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	2000                
 	rawDataSize         	21248               
-	totalSize           	23248               
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/metadataonly_acid_empty_partition.q.out b/ql/src/test/results/clientpositive/llap/metadataonly_acid_empty_partition.q.out
index 4c2c9a5c4f7..3808806462e 100644
--- a/ql/src/test/results/clientpositive/llap/metadataonly_acid_empty_partition.q.out
+++ b/ql/src/test/results/clientpositive/llap/metadataonly_acid_empty_partition.q.out
@@ -33,7 +33,7 @@ Table Parameters:
 	numPartitions       	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/mm_all.q.out b/ql/src/test/results/clientpositive/llap/mm_all.q.out
index b840dcdc956..72922cf6da9 100644
--- a/ql/src/test/results/clientpositive/llap/mm_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/mm_all.q.out
@@ -1887,7 +1887,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	6                   
 	rawDataSize         	13                  
-	totalSize           	19                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -1938,7 +1938,7 @@ Table Parameters:
 	numFiles            	6                   
 	numRows             	12                  
 	rawDataSize         	26                  
-	totalSize           	38                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -2001,7 +2001,7 @@ Table Parameters:
 	numFiles            	33                  
 	numRows             	500                 
 	rawDataSize         	5312                
-	totalSize           	5812                
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/mm_default.q.out b/ql/src/test/results/clientpositive/llap/mm_default.q.out
index 16a38f3255f..7110781d2ef 100644
--- a/ql/src/test/results/clientpositive/llap/mm_default.q.out
+++ b/ql/src/test/results/clientpositive/llap/mm_default.q.out
@@ -115,7 +115,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -151,7 +151,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -187,7 +187,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	3                   
-	totalSize           	4                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -223,7 +223,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -259,7 +259,7 @@ Table Parameters:
 	numFiles            	1                   
 	numRows             	1                   
 	rawDataSize         	3                   
-	totalSize           	4                   
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -293,7 +293,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
@@ -327,7 +327,7 @@ Table Parameters:
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	0                   
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	default             
 #### A masked pattern was here ####
diff --git a/ql/src/test/results/clientpositive/llap/mm_exim.q.out b/ql/src/test/results/clientpositive/llap/mm_exim.q.out
index e5d5b24695f..1244067596a 100644
--- a/ql/src/test/results/clientpositive/llap/mm_exim.q.out
+++ b/ql/src/test/results/clientpositive/llap/mm_exim.q.out
@@ -338,7 +338,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	6                   
 	rawDataSize         	37                  
-	totalSize           	43                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -420,7 +420,7 @@ Table Parameters:
 	numPartitions       	3                   
 	numRows             	6                   
 	rawDataSize         	13                  
-	totalSize           	19                  
+	totalSize           	#Masked#
 	transactional       	true                
 	transactional_properties	insert_only         
 #### A masked pattern was here ####
@@ -694,7 +694,7 @@ Table Parameters:
 	numFiles            	3                   
 	numRows             	6                   
 	rawDataSize         	37                  
-	totalSize           	43                  
+	totalSize           	#Masked#
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out b/ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out
index 11f927e3d5d..8a880ab6ea0 100644
--- a/ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_insert_partitioned.q.out
@@ -124,7 +124,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	12                  
 	rawDataSize         	74                  
-	totalSize           	86                  
+	totalSize           	#Masked#                          
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -212,7 +212,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	12                  
 	rawDataSize         	74                  
-	totalSize           	86                  
+	totalSize           	#Masked#                          
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -306,7 +306,7 @@ Table Parameters:
 	numPartitions       	2                   
 	numRows             	18                  
 	rawDataSize         	111                 
-	totalSize           	129                 
+	totalSize           	#Masked#                         
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -424,7 +424,7 @@ Table Parameters:
 	numPartitions       	5                   
 	numRows             	30                  
 	rawDataSize         	185                 
-	totalSize           	215                 
+	totalSize           	#Masked#                         
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -547,7 +547,7 @@ Table Parameters:
 	numPartitions       	5                   
 	numRows             	42                  
 	rawDataSize         	259                 
-	totalSize           	301                 
+	totalSize           	#Masked#                         
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
diff --git a/ql/src/test/results/clientpositive/llap/named_column_join.q.out b/ql/src/test/results/clientpositive/llap/named_column_join.q.out
index b3fb8e9aef4..8969419b424 100644
--- a/ql/src/test/results/clientpositive/llap/named_column_join.q.out
+++ b/ql/src/test/results/clientpositive/llap/named_column_join.q.out
... 2968 lines suppressed ...