HIVE-18797 : ExprConstNodeDesc's getExprString should put appropriate qualifier 
with literals (Vineet Garg, reviewed by Ashutosh Chauhan)


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

Branch: refs/heads/master
Commit: 17441e48574bd5a920c8da31c99e6cb2e5c5dcaa
Parents: fc8a45b
Author: Vineet Garg <vg...@apache.org>
Authored: Fri Mar 2 10:46:08 2018 -0800
Committer: Vineet Garg <vg...@apache.org>
Committed: Fri Mar 2 10:46:08 2018 -0800

----------------------------------------------------------------------
 .../results/positive/accumulo_queries.q.out     |   2 +-
 .../test/results/clientpositive/dboutput.q.out  |   2 +-
 .../clientpositive/udaf_example_avg.q.out       |   2 +-
 .../clientpositive/udaf_example_max.q.out       |   2 +-
 .../clientpositive/udaf_example_max_n.q.out     |   2 +-
 .../clientpositive/udaf_example_min.q.out       |   2 +-
 .../clientpositive/udaf_example_min_n.q.out     |   2 +-
 .../clientpositive/udf_example_add.q.out        |   2 +-
 .../src/test/results/positive/hbase_ddl.q.out   |   2 +-
 .../test/results/positive/hbase_queries.q.out   |   2 +-
 .../test/results/positive/hbase_timestamp.q.out |   8 +-
 .../hive/ql/plan/ExprNodeConstantDesc.java      |  25 +++
 .../clientpositive/allcolref_in_udf.q.out       |  10 +-
 .../annotate_stats_deep_filters.q.out           |   4 +-
 .../clientpositive/annotate_stats_groupby.q.out |  32 ++--
 .../annotate_stats_groupby2.q.out               |   6 +-
 .../clientpositive/annotate_stats_select.q.out  |   8 +-
 .../results/clientpositive/auto_join11.q.out    |   4 +-
 .../results/clientpositive/auto_join12.q.out    |   6 +-
 .../results/clientpositive/auto_join13.q.out    |   6 +-
 .../results/clientpositive/auto_join14.q.out    |   4 +-
 .../results/clientpositive/auto_join16.q.out    |   4 +-
 .../results/clientpositive/auto_join27.q.out    |   6 +-
 .../results/clientpositive/auto_join33.q.out    |  12 +-
 .../results/clientpositive/auto_join4.q.out     |   4 +-
 .../results/clientpositive/auto_join5.q.out     |   4 +-
 .../results/clientpositive/auto_join6.q.out     |   4 +-
 .../results/clientpositive/auto_join7.q.out     |   6 +-
 .../results/clientpositive/auto_join8.q.out     |   4 +-
 .../auto_join_without_localtask.q.out           |  12 +-
 ql/src/test/results/clientpositive/cast1.q.out  |   4 +-
 .../clientpositive/cast_on_constant.q.out       |  16 +-
 .../test/results/clientpositive/cbo_const.q.out |   8 +-
 .../clientpositive/cbo_rp_outer_join_ppr.q.out  |   8 +-
 .../cbo_rp_udaf_percentile_approx_23.q.out      |   2 +-
 .../clientpositive/columnstats_partlvl.q.out    |  50 +++---
 .../clientpositive/columnstats_partlvl_dp.q.out |  20 +--
 .../test/results/clientpositive/comments.q.out  |   4 +-
 .../clientpositive/constant_prop_3.q.out        |   2 +-
 .../clientpositive/constantfolding.q.out        |   6 +-
 .../results/clientpositive/constprog2.q.out     |   2 +-
 .../results/clientpositive/constprog_type.q.out |   2 +-
 .../clientpositive/correlationoptimizer10.q.out |  24 +--
 .../clientpositive/correlationoptimizer8.q.out  |  30 ++--
 .../results/clientpositive/create_view.q.out    |   2 +-
 .../clientpositive/cross_join_merge.q.out       |   2 +-
 .../results/clientpositive/ctas_colname.q.out   |   8 +-
 ql/src/test/results/clientpositive/cte_5.q.out  |   2 +-
 .../results/clientpositive/decimal_udf.q.out    |  16 +-
 .../results/clientpositive/decimal_udf2.q.out   |   4 +-
 .../druid/druidmini_dynamic_partition.q.out     |   6 +-
 .../results/clientpositive/druid_basic2.q.out   |   8 +-
 .../results/clientpositive/druid_basic3.q.out   |   6 +-
 .../clientpositive/druid_intervals.q.out        |   4 +-
 .../clientpositive/druid_timeseries.q.out       |  12 +-
 .../results/clientpositive/druid_topn.q.out     |   4 +-
 .../results/clientpositive/except_all.q.out     |  26 +--
 .../extrapolate_part_stats_date.q.out           |   2 +-
 .../clientpositive/filter_cond_pushdown.q.out   |   6 +-
 .../clientpositive/fold_eq_with_case_when.q.out |   4 +-
 .../clientpositive/fouter_join_ppr.q.out        |  16 +-
 .../clientpositive/fp_literal_arithmetic.q.out  |   4 +-
 .../test/results/clientpositive/gby_star.q.out  |   8 +-
 .../results/clientpositive/groupby_cube1.q.out  |  16 +-
 .../clientpositive/groupby_cube_multi_gby.q.out |   4 +-
 .../clientpositive/groupby_grouping_id3.q.out   |  18 +-
 .../clientpositive/groupby_grouping_sets1.q.out |  10 +-
 .../clientpositive/groupby_grouping_sets2.q.out |   8 +-
 .../clientpositive/groupby_grouping_sets3.q.out |   6 +-
 .../clientpositive/groupby_grouping_sets4.q.out |  24 +--
 .../clientpositive/groupby_grouping_sets5.q.out |   6 +-
 .../clientpositive/groupby_grouping_sets6.q.out |   8 +-
 .../groupby_grouping_sets_grouping.q.out        |  48 +++---
 .../groupby_grouping_sets_limit.q.out           |   8 +-
 .../groupby_grouping_window.q.out               |   2 +-
 .../clientpositive/groupby_position.q.out       |   6 +-
 .../clientpositive/groupby_rollup1.q.out        |  12 +-
 .../clientpositive/groupby_rollup_empty.q.out   |   2 +-
 .../clientpositive/groupby_sort_1_23.q.out      |   4 +-
 .../clientpositive/groupby_sort_skew_1_23.q.out |   4 +-
 ql/src/test/results/clientpositive/having.q.out |   8 +-
 .../test/results/clientpositive/having2.q.out   |  10 +-
 .../results/clientpositive/implicit_cast1.q.out |   2 +-
 .../infer_bucket_sort_dyn_part.q.out            |   2 +-
 .../infer_bucket_sort_grouping_operators.q.out  |   6 +-
 .../clientpositive/infer_const_type.q.out       |  10 +-
 .../test/results/clientpositive/input11.q.out   |   2 +-
 .../results/clientpositive/input11_limit.q.out  |   2 +-
 .../results/clientpositive/input2_limit.q.out   |   2 +-
 .../test/results/clientpositive/input42.q.out   |   4 +-
 .../results/clientpositive/input_part1.q.out    |   2 +-
 .../results/clientpositive/input_part4.q.out    |   2 +-
 .../results/clientpositive/input_part5.q.out    |   2 +-
 .../results/clientpositive/interval_alt.q.out   |   2 +-
 .../clientpositive/interval_arithmetic.q.out    |  16 +-
 .../results/clientpositive/ivyDownload.q.out    |   2 +-
 ql/src/test/results/clientpositive/join11.q.out |   4 +-
 ql/src/test/results/clientpositive/join12.q.out |   6 +-
 ql/src/test/results/clientpositive/join13.q.out |   6 +-
 ql/src/test/results/clientpositive/join14.q.out |   4 +-
 ql/src/test/results/clientpositive/join16.q.out |   4 +-
 ql/src/test/results/clientpositive/join34.q.out |   6 +-
 ql/src/test/results/clientpositive/join35.q.out |   6 +-
 ql/src/test/results/clientpositive/join38.q.out |   4 +-
 ql/src/test/results/clientpositive/join39.q.out |   2 +-
 ql/src/test/results/clientpositive/join4.q.out  |   4 +-
 ql/src/test/results/clientpositive/join40.q.out |   4 +-
 ql/src/test/results/clientpositive/join41.q.out |   4 +-
 ql/src/test/results/clientpositive/join45.q.out |  26 +--
 ql/src/test/results/clientpositive/join47.q.out |  26 +--
 ql/src/test/results/clientpositive/join5.q.out  |   4 +-
 ql/src/test/results/clientpositive/join6.q.out  |   4 +-
 ql/src/test/results/clientpositive/join7.q.out  |   6 +-
 ql/src/test/results/clientpositive/join8.q.out  |   4 +-
 .../test/results/clientpositive/join_vc.q.out   |   4 +-
 .../clientpositive/limit_pushdown2.q.out        |  26 +--
 .../limit_pushdown_negative.q.out               |   2 +-
 .../clientpositive/list_bucket_dml_6.q.out      |   4 +-
 .../clientpositive/list_bucket_dml_7.q.out      |   4 +-
 .../clientpositive/list_bucket_dml_8.q.out      |   2 +-
 .../results/clientpositive/literal_double.q.out |   2 +-
 .../results/clientpositive/literal_ints.q.out   |   2 +-
 .../llap/acid_vectorization_original.q.out      |  16 +-
 .../llap/column_access_stats.q.out              |   8 +-
 .../results/clientpositive/llap/cte_5.q.out     |   2 +-
 .../llap/current_date_timestamp.q.out           |   2 +-
 .../llap/dynamic_partition_pruning.q.out        | 136 +++++++--------
 .../llap/dynamic_semijoin_reduction_2.q.out     |   4 +-
 .../llap/dynamic_semijoin_reduction_3.q.out     |   4 +-
 .../llap/dynpart_sort_opt_vectorization.q.out   |  30 ++--
 .../llap/dynpart_sort_optimization.q.out        |  46 +++---
 .../llap/enforce_constraint_notnull.q.out       |   8 +-
 .../clientpositive/llap/except_distinct.q.out   |  30 ++--
 .../clientpositive/llap/explainuser_1.q.out     |  42 ++---
 .../llap/groupby_rollup_empty.q.out             |   2 +-
 .../results/clientpositive/llap/having.q.out    |   8 +-
 .../clientpositive/llap/intersect_all.q.out     |   6 +-
 .../llap/intersect_distinct.q.out               |   6 +-
 .../clientpositive/llap/intersect_merge.q.out   |  18 +-
 .../clientpositive/llap/jdbc_handler.q.out      |   2 +-
 .../clientpositive/llap/limit_pushdown.q.out    |   4 +-
 .../clientpositive/llap/limit_pushdown3.q.out   |   4 +-
 .../results/clientpositive/llap/lineage2.q.out  |   6 +-
 .../results/clientpositive/llap/lineage3.q.out  |  26 +--
 .../llap/materialized_view_rewrite_ssb.q.out    |   6 +-
 .../llap/materialized_view_rewrite_ssb_2.q.out  |   6 +-
 .../test/results/clientpositive/llap/mrr.q.out  |   2 +-
 .../llap/multi_count_distinct_null.q.out        |   8 +-
 .../llap/offset_limit_ppd_optimizer.q.out       |   4 +-
 .../clientpositive/llap/orc_merge5.q.out        |   8 +-
 .../clientpositive/llap/orc_merge6.q.out        |   8 +-
 .../llap/orc_merge_incompat1.q.out              |   2 +-
 .../llap/orc_predicate_pushdown.q.out           |  22 +--
 .../llap/parquet_predicate_pushdown.q.out       |  26 +--
 .../llap/reduce_deduplicate_extended.q.out      |  16 +-
 .../results/clientpositive/llap/sqlmerge.q.out  |   2 +-
 .../clientpositive/llap/subquery_in.q.out       |   4 +-
 .../llap/subquery_in_having.q.out               |   2 +-
 .../clientpositive/llap/subquery_multi.q.out    |  20 +--
 .../clientpositive/llap/subquery_notin.q.out    |  62 +++----
 .../clientpositive/llap/subquery_null_agg.q.out |   2 +-
 .../clientpositive/llap/subquery_scalar.q.out   |  10 +-
 .../clientpositive/llap/subquery_select.q.out   |  22 +--
 .../clientpositive/llap/subquery_views.q.out    |   4 +-
 .../clientpositive/llap/temp_table.q.out        |   4 +-
 .../llap/tez_dynpart_hashjoin_2.q.out           |   6 +-
 .../llap/tez_union_group_by.q.out               |   8 +-
 .../llap/tez_vector_dynpart_hashjoin_2.q.out    |   6 +-
 .../clientpositive/llap/unionDistinct_1.q.out   |  40 ++---
 .../clientpositive/llap/unionDistinct_3.q.out   |   4 +-
 .../clientpositive/llap/union_top_level.q.out   |  24 +--
 .../llap/vector_adaptor_usage_mode.q.out        |   4 +-
 .../clientpositive/llap/vector_between_in.q.out |  14 +-
 .../llap/vector_cast_constant.q.out             |   2 +-
 .../clientpositive/llap/vector_coalesce_2.q.out |   4 +-
 .../clientpositive/llap/vector_date_1.q.out     |  10 +-
 .../llap/vector_decimal_aggregate.q.out         |   8 +-
 .../llap/vector_decimal_math_funcs.q.out        |   8 +-
 .../llap/vector_decimal_udf.q.out               |  32 ++--
 .../llap/vector_decimal_udf2.q.out              |   8 +-
 .../clientpositive/llap/vector_elt.q.out        |   2 +-
 .../llap/vector_groupby_cube1.q.out             |  16 +-
 .../llap/vector_groupby_grouping_id1.q.out      |  16 +-
 .../llap/vector_groupby_grouping_id2.q.out      |  18 +-
 .../llap/vector_groupby_grouping_id3.q.out      |  18 +-
 .../llap/vector_groupby_grouping_sets1.q.out    |  10 +-
 .../llap/vector_groupby_grouping_sets2.q.out    |   8 +-
 .../llap/vector_groupby_grouping_sets3.q.out    |   6 +-
 .../vector_groupby_grouping_sets3_dec.q.out     |   6 +-
 .../llap/vector_groupby_grouping_sets4.q.out    |  12 +-
 .../llap/vector_groupby_grouping_sets5.q.out    |   6 +-
 .../llap/vector_groupby_grouping_sets6.q.out    |   8 +-
 .../vector_groupby_grouping_sets_grouping.q.out |  62 +++----
 .../vector_groupby_grouping_sets_limit.q.out    |   8 +-
 .../llap/vector_groupby_grouping_window.q.out   |   2 +-
 .../llap/vector_groupby_mapjoin.q.out           |   2 +-
 .../llap/vector_groupby_rollup1.q.out           |  12 +-
 .../llap/vector_grouping_sets.q.out             |   6 +-
 .../clientpositive/llap/vector_interval_1.q.out |  20 +--
 .../clientpositive/llap/vector_interval_2.q.out |  20 +--
 .../llap/vector_interval_arithmetic.q.out       |  14 +-
 .../llap/vector_number_compare_projection.q.out |   8 +-
 .../clientpositive/llap/vector_nvl.q.out        |   2 +-
 .../llap/vector_ptf_part_simple.q.out           |  32 ++--
 .../llap/vector_reuse_scratchcols.q.out         |   8 +-
 .../llap/vector_string_concat.q.out             |   2 +-
 .../llap/vector_string_decimal.q.out            |   2 +-
 .../clientpositive/llap/vector_struct_in.q.out  |   4 +-
 .../llap/vector_udf_adaptor_1.q.out             |   4 +-
 .../llap/vector_windowing_expressions.q.out     |   4 +-
 .../llap/vector_windowing_navfn.q.out           |   4 +-
 .../llap/vector_windowing_order_null.q.out      |   4 +-
 .../llap/vector_windowing_rank.q.out            |   2 +-
 .../llap/vector_windowing_streaming.q.out       |   2 +-
 .../llap/vector_windowing_windowspec.q.out      |   4 +-
 .../clientpositive/llap/vectorization_0.q.out   |   2 +-
 .../clientpositive/llap/vectorization_1.q.out   |   2 +-
 .../clientpositive/llap/vectorization_10.q.out  |   4 +-
 .../clientpositive/llap/vectorization_11.q.out  |   2 +-
 .../clientpositive/llap/vectorization_12.q.out  |   2 +-
 .../clientpositive/llap/vectorization_13.q.out  |   8 +-
 .../clientpositive/llap/vectorization_14.q.out  |   6 +-
 .../clientpositive/llap/vectorization_15.q.out  |   4 +-
 .../clientpositive/llap/vectorization_16.q.out  |   4 +-
 .../clientpositive/llap/vectorization_17.q.out  |   4 +-
 .../clientpositive/llap/vectorization_2.q.out   |   4 +-
 .../clientpositive/llap/vectorization_3.q.out   |   4 +-
 .../clientpositive/llap/vectorization_4.q.out   |   4 +-
 .../clientpositive/llap/vectorization_5.q.out   |   2 +-
 .../clientpositive/llap/vectorization_6.q.out   |   4 +-
 .../clientpositive/llap/vectorization_7.q.out   |   4 +-
 .../clientpositive/llap/vectorization_8.q.out   |   8 +-
 .../clientpositive/llap/vectorization_9.q.out   |   4 +-
 .../llap/vectorization_part_project.q.out       |   2 +-
 .../llap/vectorization_short_regress.q.out      |  34 ++--
 .../clientpositive/llap/vectorized_case.q.out   |  14 +-
 .../clientpositive/llap/vectorized_casts.q.out  |   2 +-
 .../llap/vectorized_date_funcs.q.out            |   6 +-
 .../vectorized_dynamic_partition_pruning.q.out  | 136 +++++++--------
 .../llap/vectorized_math_funcs.q.out            |   4 +-
 .../llap/vectorized_timestamp.q.out             |   2 +-
 .../llap/vectorized_timestamp_funcs.q.out       |   2 +-
 .../llap/vectorized_timestamp_ints_casts.q.out  |   4 +-
 .../clientpositive/load_dyn_part13.q.out        |   4 +-
 .../clientpositive/louter_join_ppr.q.out        |  16 +-
 ql/src/test/results/clientpositive/macro.q.out  |   4 +-
 .../test/results/clientpositive/mapjoin1.q.out  |  16 +-
 .../test/results/clientpositive/mapjoin47.q.out |  26 +--
 .../test/results/clientpositive/masking_1.q.out |   2 +-
 .../results/clientpositive/masking_12.q.out     |   6 +-
 .../test/results/clientpositive/masking_3.q.out |   2 +-
 .../materialized_view_rewrite_ssb.q.out         |   6 +-
 .../materialized_view_rewrite_ssb_2.q.out       |   6 +-
 .../merge_dynamic_partition4.q.out              |   2 +-
 .../merge_dynamic_partition5.q.out              |   2 +-
 .../results/clientpositive/mergejoins.q.out     |   2 +-
 .../clientpositive/multi_insert_union_src.q.out |   4 +-
 .../results/clientpositive/noalias_subq1.q.out  |   2 +-
 .../nonblock_op_deduplicate.q.out               |   2 +-
 .../results/clientpositive/nonmr_fetch.q.out    |  12 +-
 .../results/clientpositive/notable_alias1.q.out |   2 +-
 .../results/clientpositive/notable_alias2.q.out |   2 +-
 .../test/results/clientpositive/nullgroup.q.out |   8 +-
 .../results/clientpositive/nullgroup2.q.out     |   8 +-
 .../results/clientpositive/nullgroup4.q.out     |   8 +-
 .../nullgroup4_multi_distinct.q.out             |   4 +-
 .../clientpositive/num_op_type_conv.q.out       |   2 +-
 .../results/clientpositive/orc_merge5.q.out     |   8 +-
 .../results/clientpositive/orc_merge6.q.out     |   8 +-
 .../clientpositive/orc_merge_incompat1.q.out    |   2 +-
 .../clientpositive/order_by_expr_1.q.out        |   2 +-
 .../results/clientpositive/outer_join_ppr.q.out |   8 +-
 .../parquet_vectorization_0.q.out               |   2 +-
 .../parquet_vectorization_1.q.out               |   2 +-
 .../parquet_vectorization_10.q.out              |   4 +-
 .../parquet_vectorization_11.q.out              |   2 +-
 .../parquet_vectorization_12.q.out              |   2 +-
 .../parquet_vectorization_13.q.out              |   8 +-
 .../parquet_vectorization_14.q.out              |   6 +-
 .../parquet_vectorization_15.q.out              |   4 +-
 .../parquet_vectorization_16.q.out              |   4 +-
 .../parquet_vectorization_17.q.out              |   4 +-
 .../parquet_vectorization_2.q.out               |   4 +-
 .../parquet_vectorization_3.q.out               |   4 +-
 .../parquet_vectorization_4.q.out               |   4 +-
 .../parquet_vectorization_5.q.out               |   2 +-
 .../parquet_vectorization_6.q.out               |   4 +-
 .../parquet_vectorization_7.q.out               |   4 +-
 .../parquet_vectorization_8.q.out               |   8 +-
 .../parquet_vectorization_9.q.out               |   4 +-
 .../parquet_vectorization_div0.q.out            |   8 +-
 .../parquet_vectorization_limit.q.out           |   2 +-
 .../parquet_vectorization_part_project.q.out    |   2 +-
 .../partition_wise_fileformat2.q.out            |   4 +-
 ql/src/test/results/clientpositive/pcr.q.out    |   4 +-
 .../clientpositive/perf/spark/query12.q.out     |   2 +-
 .../clientpositive/perf/spark/query16.q.out     |   2 +-
 .../clientpositive/perf/spark/query18.q.out     |   2 +-
 .../clientpositive/perf/spark/query20.q.out     |   2 +-
 .../clientpositive/perf/spark/query21.q.out     |   6 +-
 .../clientpositive/perf/spark/query22.q.out     |   2 +-
 .../clientpositive/perf/spark/query23.q.out     |   2 +-
 .../clientpositive/perf/spark/query27.q.out     |   2 +-
 .../clientpositive/perf/spark/query32.q.out     |   4 +-
 .../clientpositive/perf/spark/query34.q.out     |   2 +-
 .../clientpositive/perf/spark/query36.q.out     |   2 +-
 .../clientpositive/perf/spark/query37.q.out     |   2 +-
 .../clientpositive/perf/spark/query38.q.out     |   2 +-
 .../clientpositive/perf/spark/query39.q.out     |   8 +-
 .../clientpositive/perf/spark/query40.q.out     |   4 +-
 .../clientpositive/perf/spark/query45.q.out     |   2 +-
 .../clientpositive/perf/spark/query5.q.out      |  10 +-
 .../clientpositive/perf/spark/query6.q.out      |   2 +-
 .../clientpositive/perf/spark/query67.q.out     |   2 +-
 .../clientpositive/perf/spark/query70.q.out     |   2 +-
 .../clientpositive/perf/spark/query72.q.out     |   2 +-
 .../clientpositive/perf/spark/query73.q.out     |   2 +-
 .../clientpositive/perf/spark/query77.q.out     |  16 +-
 .../clientpositive/perf/spark/query8.q.out      |   4 +-
 .../clientpositive/perf/spark/query80.q.out     |  12 +-
 .../clientpositive/perf/spark/query82.q.out     |   2 +-
 .../clientpositive/perf/spark/query83.q.out     |   2 +-
 .../clientpositive/perf/spark/query86.q.out     |   2 +-
 .../clientpositive/perf/spark/query87.q.out     |  12 +-
 .../clientpositive/perf/spark/query9.q.out      |   2 +-
 .../clientpositive/perf/spark/query92.q.out     |   4 +-
 .../clientpositive/perf/spark/query94.q.out     |   2 +-
 .../clientpositive/perf/spark/query95.q.out     |   2 +-
 .../clientpositive/perf/spark/query98.q.out     |   2 +-
 .../clientpositive/perf/tez/query12.q.out       |   2 +-
 .../clientpositive/perf/tez/query14.q.out       |  12 +-
 .../clientpositive/perf/tez/query16.q.out       |   2 +-
 .../clientpositive/perf/tez/query18.q.out       |   2 +-
 .../clientpositive/perf/tez/query20.q.out       |   2 +-
 .../clientpositive/perf/tez/query21.q.out       |   4 +-
 .../clientpositive/perf/tez/query22.q.out       |   2 +-
 .../clientpositive/perf/tez/query23.q.out       |   2 +-
 .../clientpositive/perf/tez/query27.q.out       |   2 +-
 .../clientpositive/perf/tez/query32.q.out       |   2 +-
 .../clientpositive/perf/tez/query34.q.out       |   2 +-
 .../clientpositive/perf/tez/query36.q.out       |   2 +-
 .../clientpositive/perf/tez/query37.q.out       |   2 +-
 .../clientpositive/perf/tez/query38.q.out       |   2 +-
 .../clientpositive/perf/tez/query39.q.out       |   4 +-
 .../clientpositive/perf/tez/query40.q.out       |   2 +-
 .../clientpositive/perf/tez/query45.q.out       |   2 +-
 .../clientpositive/perf/tez/query5.q.out        |   8 +-
 .../clientpositive/perf/tez/query6.q.out        |   2 +-
 .../clientpositive/perf/tez/query67.q.out       |   2 +-
 .../clientpositive/perf/tez/query70.q.out       |   2 +-
 .../clientpositive/perf/tez/query72.q.out       |   2 +-
 .../clientpositive/perf/tez/query73.q.out       |   2 +-
 .../clientpositive/perf/tez/query77.q.out       |   8 +-
 .../clientpositive/perf/tez/query8.q.out        |   4 +-
 .../clientpositive/perf/tez/query80.q.out       |   8 +-
 .../clientpositive/perf/tez/query82.q.out       |   2 +-
 .../clientpositive/perf/tez/query86.q.out       |   2 +-
 .../clientpositive/perf/tez/query87.q.out       |   4 +-
 .../clientpositive/perf/tez/query92.q.out       |   2 +-
 .../clientpositive/perf/tez/query94.q.out       |   2 +-
 .../clientpositive/perf/tez/query95.q.out       |   2 +-
 .../clientpositive/perf/tez/query98.q.out       |   2 +-
 ql/src/test/results/clientpositive/ppd2.q.out   |   4 +-
 .../test/results/clientpositive/ppd_gby.q.out   |   4 +-
 .../test/results/clientpositive/ppd_gby2.q.out  |   4 +-
 .../test/results/clientpositive/ppd_join2.q.out |   4 +-
 .../clientpositive/ppd_join_filter.q.out        |  16 +-
 .../clientpositive/ppd_outer_join1.q.out        |   8 +-
 .../clientpositive/ppd_outer_join4.q.out        |  12 +-
 .../results/clientpositive/ppd_random.q.out     |   4 +-
 .../results/clientpositive/ppd_udf_col.q.out    |  16 +-
 .../test/results/clientpositive/ppd_udtf.q.out  |   4 +-
 ql/src/test/results/clientpositive/ppd_vc.q.out |   4 +-
 .../results/clientpositive/ppd_windowing1.q.out |  12 +-
 .../results/clientpositive/ppr_pushdown3.q.out  |   2 +-
 ql/src/test/results/clientpositive/quote1.q.out |   2 +-
 .../clientpositive/rand_partitionpruner1.q.out  |   2 +-
 .../clientpositive/rand_partitionpruner2.q.out  |   2 +-
 .../clientpositive/rand_partitionpruner3.q.out  |   4 +-
 .../clientpositive/rcfile_null_value.q.out      |   4 +-
 .../test/results/clientpositive/regex_col.q.out |   4 +-
 .../clientpositive/results_cache_2.q.out        |  10 +-
 .../clientpositive/results_cache_capacity.q.out |   4 +-
 .../results_cache_temptable.q.out               |   6 +-
 .../clientpositive/router_join_ppr.q.out        |  16 +-
 .../clientpositive/select_unquote_and.q.out     |   2 +-
 .../clientpositive/select_unquote_not.q.out     |   2 +-
 .../clientpositive/select_unquote_or.q.out      |   2 +-
 .../test/results/clientpositive/semijoin4.q.out |   4 +-
 .../set_processor_namespaces.q.out              |   2 +-
 .../results/clientpositive/setop_subq.q.out     |   6 +-
 .../clientpositive/spark/auto_join11.q.out      |   4 +-
 .../clientpositive/spark/auto_join12.q.out      |   6 +-
 .../clientpositive/spark/auto_join13.q.out      |   6 +-
 .../clientpositive/spark/auto_join14.q.out      |   4 +-
 .../clientpositive/spark/auto_join16.q.out      |   4 +-
 .../clientpositive/spark/auto_join27.q.out      |   6 +-
 .../clientpositive/spark/auto_join4.q.out       |   4 +-
 .../clientpositive/spark/auto_join5.q.out       |   4 +-
 .../clientpositive/spark/auto_join6.q.out       |   4 +-
 .../clientpositive/spark/auto_join7.q.out       |   6 +-
 .../clientpositive/spark/auto_join8.q.out       |   4 +-
 .../spark/auto_join_without_localtask.q.out     |   4 +-
 .../spark/column_access_stats.q.out             |   8 +-
 .../spark/dynamic_rdd_cache.q.out               |  12 +-
 .../clientpositive/spark/groupby_cube1.q.out    |  16 +-
 .../clientpositive/spark/groupby_position.q.out |   6 +-
 .../clientpositive/spark/groupby_rollup1.q.out  |  12 +-
 .../spark/groupby_sort_1_23.q.out               |   4 +-
 .../spark/groupby_sort_skew_1_23.q.out          |   4 +-
 .../results/clientpositive/spark/having.q.out   |   8 +-
 .../results/clientpositive/spark/join11.q.out   |   4 +-
 .../results/clientpositive/spark/join12.q.out   |   6 +-
 .../results/clientpositive/spark/join13.q.out   |   6 +-
 .../results/clientpositive/spark/join14.q.out   |   4 +-
 .../results/clientpositive/spark/join16.q.out   |   4 +-
 .../results/clientpositive/spark/join34.q.out   |   6 +-
 .../results/clientpositive/spark/join35.q.out   |   6 +-
 .../results/clientpositive/spark/join38.q.out   |   4 +-
 .../results/clientpositive/spark/join39.q.out   |   2 +-
 .../results/clientpositive/spark/join4.q.out    |   4 +-
 .../results/clientpositive/spark/join40.q.out   |   4 +-
 .../results/clientpositive/spark/join41.q.out   |   4 +-
 .../results/clientpositive/spark/join5.q.out    |   4 +-
 .../results/clientpositive/spark/join6.q.out    |   4 +-
 .../results/clientpositive/spark/join7.q.out    |   6 +-
 .../results/clientpositive/spark/join8.q.out    |   4 +-
 .../results/clientpositive/spark/join_vc.q.out  |   4 +-
 .../clientpositive/spark/limit_pushdown.q.out   |   4 +-
 .../clientpositive/spark/limit_pushdown2.q.out  |  26 +--
 .../clientpositive/spark/load_dyn_part13.q.out  |   4 +-
 .../clientpositive/spark/louter_join_ppr.q.out  |  16 +-
 .../results/clientpositive/spark/mapjoin1.q.out |  16 +-
 .../clientpositive/spark/mergejoins.q.out       |   2 +-
 .../clientpositive/spark/nullgroup.q.out        |   8 +-
 .../clientpositive/spark/nullgroup2.q.out       |   8 +-
 .../clientpositive/spark/nullgroup4.q.out       |   8 +-
 .../spark/nullgroup4_multi_distinct.q.out       |   4 +-
 .../clientpositive/spark/orc_merge5.q.out       |   8 +-
 .../clientpositive/spark/orc_merge6.q.out       |   8 +-
 .../spark/orc_merge_incompat1.q.out             |   2 +-
 .../clientpositive/spark/outer_join_ppr.q.out   |   8 +-
 .../spark/parquet_vectorization_0.q.out         |   2 +-
 .../spark/parquet_vectorization_1.q.out         |   2 +-
 .../spark/parquet_vectorization_10.q.out        |   4 +-
 .../spark/parquet_vectorization_11.q.out        |   2 +-
 .../spark/parquet_vectorization_12.q.out        |   2 +-
 .../spark/parquet_vectorization_13.q.out        |   8 +-
 .../spark/parquet_vectorization_14.q.out        |   6 +-
 .../spark/parquet_vectorization_15.q.out        |   4 +-
 .../spark/parquet_vectorization_16.q.out        |   4 +-
 .../spark/parquet_vectorization_17.q.out        |   4 +-
 .../spark/parquet_vectorization_2.q.out         |   4 +-
 .../spark/parquet_vectorization_3.q.out         |   4 +-
 .../spark/parquet_vectorization_4.q.out         |   4 +-
 .../spark/parquet_vectorization_5.q.out         |   2 +-
 .../spark/parquet_vectorization_6.q.out         |   4 +-
 .../spark/parquet_vectorization_7.q.out         |   4 +-
 .../spark/parquet_vectorization_8.q.out         |   8 +-
 .../spark/parquet_vectorization_9.q.out         |   4 +-
 .../spark/parquet_vectorization_div0.q.out      |   8 +-
 .../spark/parquet_vectorization_limit.q.out     |   2 +-
 .../parquet_vectorization_part_project.q.out    |   2 +-
 .../test/results/clientpositive/spark/pcr.q.out |   4 +-
 .../clientpositive/spark/ppd_join2.q.out        |   4 +-
 .../clientpositive/spark/ppd_join_filter.q.out  |  16 +-
 .../clientpositive/spark/ppd_outer_join1.q.out  |   8 +-
 .../clientpositive/spark/ppd_outer_join4.q.out  |  12 +-
 .../clientpositive/spark/router_join_ppr.q.out  |  16 +-
 .../spark/spark_dynamic_partition_pruning.q.out | 164 +++++++++----------
 ...dynamic_partition_pruning_mapjoin_only.q.out |  18 +-
 .../spark/spark_explainuser_1.q.out             |  48 +++---
 .../spark/spark_union_merge.q.out               |   8 +-
 .../spark/spark_use_op_stats.q.out              |  12 +-
 .../spark/spark_use_ts_stats_for_mapjoin.q.out  |   4 +-
 ...k_vectorized_dynamic_partition_pruning.q.out | 160 +++++++++---------
 .../clientpositive/spark/subquery_in.q.out      |   4 +-
 .../clientpositive/spark/subquery_multi.q.out   |  20 +--
 .../spark/subquery_multiinsert.q.out            |   8 +-
 .../clientpositive/spark/subquery_notin.q.out   |  62 +++----
 .../spark/subquery_null_agg.q.out               |   2 +-
 .../clientpositive/spark/subquery_scalar.q.out  |  56 +++----
 .../clientpositive/spark/subquery_select.q.out  |  22 +--
 .../clientpositive/spark/subquery_views.q.out   |   4 +-
 .../clientpositive/spark/temp_table.q.out       |   4 +-
 .../clientpositive/spark/udf_example_add.q.out  |   2 +-
 .../results/clientpositive/spark/union.q.out    |   4 +-
 .../results/clientpositive/spark/union20.q.out  |   4 +-
 .../results/clientpositive/spark/union22.q.out  |   6 +-
 .../results/clientpositive/spark/union24.q.out  |  24 +--
 .../results/clientpositive/spark/union27.q.out  |   6 +-
 .../results/clientpositive/spark/union33.q.out  |   4 +-
 .../clientpositive/spark/union_remove_10.q.out  |   4 +-
 .../clientpositive/spark/union_remove_12.q.out  |   2 +-
 .../clientpositive/spark/union_remove_14.q.out  |   2 +-
 .../clientpositive/spark/union_remove_19.q.out  |   4 +-
 .../clientpositive/spark/union_remove_2.q.out   |   4 +-
 .../clientpositive/spark/union_remove_5.q.out   |   4 +-
 .../spark/union_remove_6_subq.q.out             |   4 +-
 .../clientpositive/spark/union_remove_8.q.out   |   4 +-
 .../clientpositive/spark/union_top_level.q.out  |  24 +--
 .../spark/vector_between_in.q.out               |  14 +-
 .../spark/vector_cast_constant.q.out            |   2 +-
 .../spark/vector_decimal_aggregate.q.out        |   8 +-
 .../clientpositive/spark/vector_elt.q.out       |   2 +-
 .../spark/vector_string_concat.q.out            |   2 +-
 .../clientpositive/spark/vectorization_0.q.out  |   2 +-
 .../clientpositive/spark/vectorization_1.q.out  |   2 +-
 .../clientpositive/spark/vectorization_10.q.out |   4 +-
 .../clientpositive/spark/vectorization_11.q.out |   2 +-
 .../clientpositive/spark/vectorization_12.q.out |   2 +-
 .../clientpositive/spark/vectorization_13.q.out |   8 +-
 .../clientpositive/spark/vectorization_14.q.out |   6 +-
 .../clientpositive/spark/vectorization_15.q.out |   4 +-
 .../clientpositive/spark/vectorization_16.q.out |   4 +-
 .../clientpositive/spark/vectorization_17.q.out |   4 +-
 .../clientpositive/spark/vectorization_2.q.out  |   4 +-
 .../clientpositive/spark/vectorization_3.q.out  |   4 +-
 .../clientpositive/spark/vectorization_4.q.out  |   4 +-
 .../clientpositive/spark/vectorization_5.q.out  |   2 +-
 .../clientpositive/spark/vectorization_6.q.out  |   4 +-
 .../clientpositive/spark/vectorization_9.q.out  |   4 +-
 .../spark/vectorization_div0.q.out              |  10 +-
 .../spark/vectorization_part_project.q.out      |   2 +-
 .../spark/vectorization_short_regress.q.out     |  34 ++--
 .../clientpositive/spark/vectorized_case.q.out  |  14 +-
 .../spark/vectorized_math_funcs.q.out           |   4 +-
 .../spark/vectorized_timestamp_funcs.q.out      |   2 +-
 .../special_character_in_tabnames_2.q.out       |   2 +-
 .../results/clientpositive/stats_ppr_all.q.out  |   6 +-
 ql/src/test/results/clientpositive/subq.q.out   |   2 +-
 ql/src/test/results/clientpositive/subq2.q.out  |   2 +-
 .../results/clientpositive/subquery_alias.q.out |   2 +-
 .../clientpositive/subquery_multiinsert.q.out   |   8 +-
 .../clientpositive/subquery_notin_having.q.out  |  18 +-
 .../subquery_unqual_corr_expr.q.out             |   4 +-
 .../subquery_unqualcolumnrefs.q.out             |   2 +-
 .../tez/acid_vectorization_original_tez.q.out   |  16 +-
 .../clientpositive/tez/explainanalyze_1.q.out   |  12 +-
 .../clientpositive/tez/explainanalyze_3.q.out   |   2 +-
 .../clientpositive/tez/explainuser_3.q.out      |   2 +-
 .../tez/multi_count_distinct.q.out              |   4 +-
 .../results/clientpositive/tez/tez-tag.q.out    |   2 +-
 .../clientpositive/tez/vectorization_div0.q.out |  10 +-
 .../tez/vectorization_limit.q.out               |   2 +-
 .../test/results/clientpositive/timestamp.q.out |  12 +-
 .../clientpositive/timestamp_ints_casts.q.out   |   4 +-
 .../clientpositive/timestamp_literal.q.out      |   2 +-
 .../results/clientpositive/timestamptz.q.out    |   8 +-
 .../results/clientpositive/type_widening.q.out  |  10 +-
 .../udaf_percentile_approx_23.q.out             |   2 +-
 ql/src/test/results/clientpositive/udf1.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf4.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf5.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf6.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf7.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf9.q.out   |   4 +-
 .../results/clientpositive/udf_10_trims.q.out   |   2 +-
 ql/src/test/results/clientpositive/udf_E.q.out  |   4 +-
 ql/src/test/results/clientpositive/udf_PI.q.out |   4 +-
 .../test/results/clientpositive/udf_abs.q.out   |   2 +-
 .../results/clientpositive/udf_between.q.out    |   4 +-
 .../test/results/clientpositive/udf_cbrt.q.out  |   2 +-
 .../test/results/clientpositive/udf_crc32.q.out |   2 +-
 .../results/clientpositive/udf_degrees.q.out    |   4 +-
 .../clientpositive/udf_example_add.q.out        |   2 +-
 .../results/clientpositive/udf_factorial.q.out  |   2 +-
 .../clientpositive/udf_folder_constants.q.out   |   2 +-
 .../clientpositive/udf_from_utc_timestamp.q.out |   2 +-
 .../test/results/clientpositive/udf_hour.q.out  |   2 +-
 ql/src/test/results/clientpositive/udf_if.q.out |   2 +-
 .../clientpositive/udf_java_method.q.out        |   2 +-
 .../test/results/clientpositive/udf_like.q.out  |   2 +-
 .../test/results/clientpositive/udf_lower.q.out |   2 +-
 .../results/clientpositive/udf_minute.q.out     |   2 +-
 .../clientpositive/udf_months_between.q.out     |   2 +-
 .../results/clientpositive/udf_parse_url.q.out  |   2 +-
 .../results/clientpositive/udf_radians.q.out    |   4 +-
 .../results/clientpositive/udf_reflect.q.out    |   2 +-
 .../results/clientpositive/udf_reflect2.q.out   |   2 +-
 .../results/clientpositive/udf_second.q.out     |   2 +-
 .../test/results/clientpositive/udf_sign.q.out  |   4 +-
 .../clientpositive/udf_to_utc_timestamp.q.out   |   2 +-
 ql/src/test/results/clientpositive/union.q.out  |   4 +-
 .../test/results/clientpositive/union20.q.out   |   4 +-
 .../test/results/clientpositive/union22.q.out   |  10 +-
 .../test/results/clientpositive/union24.q.out   |  24 +--
 .../test/results/clientpositive/union27.q.out   |   6 +-
 .../test/results/clientpositive/union33.q.out   |   4 +-
 .../clientpositive/union_pos_alias.q.out        |   2 +-
 .../clientpositive/union_remove_10.q.out        |   4 +-
 .../clientpositive/union_remove_12.q.out        |   2 +-
 .../clientpositive/union_remove_14.q.out        |   2 +-
 .../clientpositive/union_remove_19.q.out        |   8 +-
 .../results/clientpositive/union_remove_2.q.out |   4 +-
 .../results/clientpositive/union_remove_5.q.out |   4 +-
 .../clientpositive/union_remove_6_subq.q.out    |   4 +-
 .../results/clientpositive/union_remove_8.q.out |   4 +-
 .../clientpositive/vector_cast_constant.q.out   |   2 +-
 .../clientpositive/vector_coalesce_2.q.out      |   4 +-
 .../results/clientpositive/vector_date_1.q.out  |  10 +-
 .../vector_decimal_aggregate.q.out              |   8 +-
 .../vector_decimal_math_funcs.q.out             |   8 +-
 .../clientpositive/vector_decimal_udf2.q.out    |   8 +-
 .../results/clientpositive/vector_elt.q.out     |   2 +-
 .../clientpositive/vector_groupby_mapjoin.q.out |   4 +-
 .../clientpositive/vector_grouping_sets.q.out   |   6 +-
 .../clientpositive/vector_interval_1.q.out      |  20 +--
 .../vector_interval_arithmetic.q.out            |  14 +-
 .../results/clientpositive/vector_nvl.q.out     |   2 +-
 .../clientpositive/vector_string_concat.q.out   |   2 +-
 .../clientpositive/vector_struct_in.q.out       |   4 +-
 .../clientpositive/vectorization_1.q.out        |   2 +-
 .../clientpositive/vectorization_10.q.out       |   4 +-
 .../clientpositive/vectorization_11.q.out       |   2 +-
 .../clientpositive/vectorization_12.q.out       |   2 +-
 .../clientpositive/vectorization_13.q.out       |   8 +-
 .../clientpositive/vectorization_14.q.out       |   6 +-
 .../clientpositive/vectorization_15.q.out       |   4 +-
 .../clientpositive/vectorization_16.q.out       |   4 +-
 .../clientpositive/vectorization_17.q.out       |   4 +-
 .../clientpositive/vectorization_2.q.out        |   4 +-
 .../clientpositive/vectorization_3.q.out        |   4 +-
 .../clientpositive/vectorization_4.q.out        |   4 +-
 .../clientpositive/vectorization_5.q.out        |   2 +-
 .../clientpositive/vectorization_6.q.out        |   4 +-
 .../clientpositive/vectorization_7.q.out        |   4 +-
 .../clientpositive/vectorization_8.q.out        |   8 +-
 .../clientpositive/vectorization_9.q.out        |   4 +-
 .../clientpositive/vectorization_limit.q.out    |   2 +-
 .../vectorization_numeric_overflows.q.out       |  12 +-
 .../vectorization_part_project.q.out            |   2 +-
 .../clientpositive/vectorized_case.q.out        |  14 +-
 .../clientpositive/vectorized_casts.q.out       |   2 +-
 .../clientpositive/vectorized_date_funcs.q.out  |   6 +-
 .../clientpositive/vectorized_math_funcs.q.out  |   4 +-
 .../clientpositive/vectorized_timestamp.q.out   |   2 +-
 .../vectorized_timestamp_funcs.q.out            |   2 +-
 .../vectorized_timestamp_ints_casts.q.out       |   4 +-
 .../test/results/clientpositive/view_cbo.q.out  |  10 +-
 640 files changed, 2464 insertions(+), 2439 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
----------------------------------------------------------------------
diff --git a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out 
b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
index 287557f..914458b 100644
--- a/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
+++ b/accumulo-handler/src/test/results/positive/accumulo_queries.q.out
@@ -68,7 +68,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) % 2.0) = 0.0) (type: boolean)
+              predicate: ((UDFToDouble(key) % 2.0D) = 0.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/dboutput.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/dboutput.q.out 
b/contrib/src/test/results/clientpositive/dboutput.q.out
index 442a98a..7427892 100644
--- a/contrib/src/test/results/clientpositive/dboutput.q.out
+++ b/contrib/src/test/results/clientpositive/dboutput.q.out
@@ -137,7 +137,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 10.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 10.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: 
dboutput('jdbc:derby:../build/test_dboutput_db','','','INSERT INTO app_info 
(kkey,vvalue) VALUES (?,?)',key,value) (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_avg.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
index 4e6cb99..7fbf229 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_avg.q.out
@@ -26,7 +26,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0), null, substr(value, 5)) (type: 
string)
+              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0D), null, substr(value, 5)) (type: 
string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udaf_example_max.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_max.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_max.q.out
index 1794c1e..e11ad8e 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_max.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_max.q.out
@@ -33,7 +33,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0), null, substr(value, 5)) (type: 
string)
+              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0D), null, substr(value, 5)) (type: 
string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
index 47d8f52..f17eef8 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_max_n.q.out
@@ -26,7 +26,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0), null, substr(value, 5)) (type: 
string)
+              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0D), null, substr(value, 5)) (type: 
string)
               outputColumnNames: _col0, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udaf_example_min.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_min.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_min.q.out
index 4f3f8f8..75f33eb 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_min.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_min.q.out
@@ -33,7 +33,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0), null, substr(value, 5)) (type: 
string)
+              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) > 250.0D), null, substr(value, 5)) (type: 
string)
               outputColumnNames: _col0, _col1
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out 
b/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
index 16c4684..ae770c0 100644
--- a/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
+++ b/contrib/src/test/results/clientpositive/udaf_example_min_n.q.out
@@ -26,7 +26,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) < 250.0), null, substr(value, 5)) (type: 
string)
+              expressions: substr(value, 5) (type: string), 
if((UDFToDouble(substr(value, 5)) < 250.0D), null, substr(value, 5)) (type: 
string)
               outputColumnNames: _col0, _col2
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/contrib/src/test/results/clientpositive/udf_example_add.q.out
----------------------------------------------------------------------
diff --git a/contrib/src/test/results/clientpositive/udf_example_add.q.out 
b/contrib/src/test/results/clientpositive/udf_example_add.q.out
index 7916679..b092383 100644
--- a/contrib/src/test/results/clientpositive/udf_example_add.q.out
+++ b/contrib/src/test/results/clientpositive/udf_example_add.q.out
@@ -36,7 +36,7 @@ STAGE PLANS:
           alias: src
           Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: COMPLETE
           Select Operator
-            expressions: 3 (type: int), 6 (type: int), 10 (type: int), 
3.3000000000000003 (type: double), 6.6 (type: double), 11.0 (type: double), 
10.4 (type: double)
+            expressions: 3 (type: int), 6 (type: int), 10 (type: int), 
3.3000000000000003D (type: double), 6.6D (type: double), 11.0D (type: double), 
10.4D (type: double)
             outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6
             Statistics: Num rows: 500 Data size: 22000 Basic stats: COMPLETE 
Column stats: COMPLETE
             Limit

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/hbase-handler/src/test/results/positive/hbase_ddl.q.out
----------------------------------------------------------------------
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 c015f29..ef3f5f7 100644
--- a/hbase-handler/src/test/results/positive/hbase_ddl.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_ddl.q.out
@@ -68,7 +68,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) % 2.0) = 0.0) (type: boolean)
+              predicate: ((UDFToDouble(key) % 2.0D) = 0.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/hbase-handler/src/test/results/positive/hbase_queries.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_queries.q.out 
b/hbase-handler/src/test/results/positive/hbase_queries.q.out
index 0fce6c8..907c5dc 100644
--- a/hbase-handler/src/test/results/positive/hbase_queries.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_queries.q.out
@@ -68,7 +68,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) % 2.0) = 0.0) (type: boolean)
+              predicate: ((UDFToDouble(key) % 2.0D) = 0.0D) (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: UDFToInteger(key) (type: int), value (type: 
string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
----------------------------------------------------------------------
diff --git a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out 
b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
index e719b08..0511c14 100644
--- a/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
+++ b/hbase-handler/src/test/results/positive/hbase_timestamp.q.out
@@ -173,7 +173,7 @@ STAGE PLANS:
             alias: hbase_table
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and (UDFToDouble(key) < 
400.0)) and (time < 200000000000)) (type: boolean)
+              predicate: (((UDFToDouble(key) > 100.0D) and (UDFToDouble(key) < 
400.0D)) and (time < 200000000000L)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), CAST( 
time AS TIMESTAMP) (type: timestamp)
@@ -221,7 +221,7 @@ STAGE PLANS:
             alias: hbase_table
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and (UDFToDouble(key) < 
400.0)) and (time > 100000000000)) (type: boolean)
+              predicate: (((UDFToDouble(key) > 100.0D) and (UDFToDouble(key) < 
400.0D)) and (time > 100000000000L)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), CAST( 
time AS TIMESTAMP) (type: timestamp)
@@ -271,7 +271,7 @@ STAGE PLANS:
             alias: hbase_table
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and (UDFToDouble(key) < 
400.0)) and (time <= 100000000000)) (type: boolean)
+              predicate: (((UDFToDouble(key) > 100.0D) and (UDFToDouble(key) < 
400.0D)) and (time <= 100000000000L)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), CAST( 
time AS TIMESTAMP) (type: timestamp)
@@ -319,7 +319,7 @@ STAGE PLANS:
             alias: hbase_table
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) > 100.0) and (UDFToDouble(key) < 
400.0)) and (time >= 200000000000)) (type: boolean)
+              predicate: (((UDFToDouble(key) > 100.0D) and (UDFToDouble(key) < 
400.0D)) and (time >= 200000000000L)) (type: boolean)
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string), CAST( 
time AS TIMESTAMP) (type: timestamp)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
----------------------------------------------------------------------
diff --git 
a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java 
b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
index 73f449f..00aff8e 100755
--- a/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
+++ b/ql/src/java/org/apache/hadoop/hive/ql/plan/ExprNodeConstantDesc.java
@@ -116,11 +116,36 @@ public class ExprNodeConstantDesc extends ExprNodeDesc 
implements Serializable {
         hexChars[j * 2 + 1] = hexArray[v & 0x0F];
       }
       return new String(hexChars);
+    } else if(typeInfo.getTypeName().equals(serdeConstants.DATE_TYPE_NAME)) {
+      return "DATE'" + value.toString() + "'";
+    } else 
if(typeInfo.getTypeName().equals(serdeConstants.TIMESTAMP_TYPE_NAME)) {
+      return "TIMESTAMP'" + value.toString() + "'";
+    } else 
if(typeInfo.getTypeName().equals(serdeConstants.TIMESTAMPLOCALTZ_TYPE_NAME)) {
+      return "TIMESTAMPLOCALTZ'" + value.toString() + "'";
+    } else if(typeInfo.getTypeName().equals(serdeConstants.TINYINT_TYPE_NAME)) 
{
+      return value.toString() + "Y";
+    } else 
if(typeInfo.getTypeName().equals(serdeConstants.SMALLINT_TYPE_NAME)) {
+      return value.toString() + "S";
+    } else if(typeInfo.getTypeName().equals(serdeConstants.BIGINT_TYPE_NAME)) {
+      return value.toString() + "L";
+    } else if(typeInfo.getTypeName().equals(serdeConstants.DOUBLE_TYPE_NAME)) {
+      return value.toString() + "D";
+    } else if(typeInfo.getTypeName().equals(serdeConstants.DECIMAL_TYPE_NAME)) 
{
+      return value.toString() + "BD";
+    } else 
if(typeInfo.getTypeName().equals(serdeConstants.INTERVAL_DAY_TIME_TYPE_NAME)
+        || 
typeInfo.getTypeName().equals(serdeConstants.INTERVAL_YEAR_MONTH_TYPE_NAME)) {
+      return "INTERVAL'" + value.toString() + "'";
     }
     return value.toString();
   }
 
   @Override
+  /**
+   * Return string representation of constant expression
+   * Beside ExplainPlan task Default constraint also make use it to 
deserialize constant expression
+   * to store it in metastore, which is later reparsed to generate appropriate 
constant expression
+   * Therefore it is necessary for this method to qualify the intervals with 
appropriate qualifiers
+   */
   public String getExprString() {
     if (typeInfo.getCategory() == Category.PRIMITIVE) {
       return getFormatted(typeInfo, value);

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/allcolref_in_udf.q.out 
b/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
index 8b72caf..d22646b 100644
--- a/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
+++ b/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
@@ -16,7 +16,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: concat(key, value) (type: string), 
array(key,value) (type: array<string>)
@@ -79,16 +79,16 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: (UDFToDouble(_col0) + 1.0) (type: double)
+                  key expressions: (UDFToDouble(_col0) + 1.0D) (type: double)
                   sort order: +
-                  Map-reduce partition columns: (UDFToDouble(_col0) + 1.0) 
(type: double)
+                  Map-reduce partition columns: (UDFToDouble(_col0) + 1.0D) 
(type: double)
                   Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col0 (type: string), _col1 (type: string)
           TableScan
@@ -112,7 +112,7 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
           keys:
-            0 (UDFToDouble(_col0) + 1.0) (type: double)
+            0 (UDFToDouble(_col0) + 1.0D) (type: double)
             1 UDFToDouble(_col0) (type: double)
           outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
index ab8c22b..970b786 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
@@ -122,7 +122,7 @@ STAGE PLANS:
             alias: over1k
             Statistics: Num rows: 2098 Data size: 16744 Basic stats: COMPLETE 
Column stats: COMPLETE
             Filter Operator
-              predicate: (((t = 1) and (si = 2)) or ((t = 10) and (si = 11)) 
or ((t = 11) and (si = 12)) or ((t = 12) and (si = 13)) or ((t = 13) and (si = 
14)) or ((t = 14) and (si = 15)) or ((t = 15) and (si = 16)) or ((t = 16) and 
(si = 17)) or ((t = 17) and (si = 18)) or ((t = 2) and (si = 3)) or ((t = 27) 
and (si = 28)) or ((t = 3) and (si = 4)) or ((t = 37) and (si = 38)) or ((t = 
4) and (si = 5)) or ((t = 47) and (si = 48)) or ((t = 5) and (si = 6)) or ((t = 
52) and (si = 53)) or ((t = 6) and (si = 7)) or ((t = 7) and (si = 8)) or ((t = 
9) and (si = 10))) (type: boolean)
+              predicate: (((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 
12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) 
and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or 
((t = 17Y) and (si = 18S)) or ((t = 1Y) and (si = 2S)) or ((t = 27Y) and (si = 
28S)) or ((t = 2Y) and (si = 3S)) or ((t = 37Y) and (si = 38S)) or ((t = 3Y) 
and (si = 4S)) or ((t = 47Y) and (si = 48S)) or ((t = 4Y) and (si = 5S)) or ((t 
= 52Y) and (si = 53S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) 
or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S))) (type: boolean)
               Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
               Select Operator
                 Statistics: Num rows: 1 Data size: 8 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -211,7 +211,7 @@ STAGE PLANS:
             alias: over1k
             Statistics: Num rows: 2098 Data size: 211174 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((t = 1) and (si = 2)) or ((t = 10) and (si = 11)) 
or ((t = 11) and (si = 12)) or ((t = 12) and (si = 13)) or ((t = 13) and (si = 
14)) or ((t = 14) and (si = 15)) or ((t = 15) and (si = 16)) or ((t = 16) and 
(si = 17)) or ((t = 17) and (si = 18)) or ((t = 2) and (si = 3)) or ((t = 27) 
and (si = 28)) or ((t = 3) and (si = 4)) or ((t = 37) and (si = 38)) or ((t = 
4) and (si = 5)) or ((t = 47) and (si = 48)) or ((t = 5) and (si = 6)) or ((t = 
52) and (si = 53)) or ((t = 6) and (si = 7)) or ((t = 7) and (si = 8)) or ((t = 
9) and (si = 10))) (type: boolean)
+              predicate: (((t = 10Y) and (si = 11S)) or ((t = 11Y) and (si = 
12S)) or ((t = 12Y) and (si = 13S)) or ((t = 13Y) and (si = 14S)) or ((t = 14Y) 
and (si = 15S)) or ((t = 15Y) and (si = 16S)) or ((t = 16Y) and (si = 17S)) or 
((t = 17Y) and (si = 18S)) or ((t = 1Y) and (si = 2S)) or ((t = 27Y) and (si = 
28S)) or ((t = 2Y) and (si = 3S)) or ((t = 37Y) and (si = 38S)) or ((t = 3Y) 
and (si = 4S)) or ((t = 47Y) and (si = 48S)) or ((t = 4Y) and (si = 5S)) or ((t 
= 52Y) and (si = 53S)) or ((t = 5Y) and (si = 6S)) or ((t = 6Y) and (si = 7S)) 
or ((t = 7Y) and (si = 8S)) or ((t = 9Y) and (si = 10S))) (type: boolean)
               Statistics: Num rows: 2098 Data size: 211174 Basic stats: 
COMPLETE Column stats: NONE
               Select Operator
                 Statistics: Num rows: 2098 Data size: 211174 Basic stats: 
COMPLETE Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
index 25efe1e..cb33177 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
@@ -304,7 +304,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -354,7 +354,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -404,7 +404,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -454,7 +454,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 8 Data size: 784 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -504,7 +504,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -554,7 +554,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2352 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -604,7 +604,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3136 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -703,7 +703,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 720 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 16 Data size: 1568 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -802,7 +802,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
@@ -852,7 +852,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -902,7 +902,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -952,7 +952,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
@@ -1002,7 +1002,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 16 Data size: 1592 Basic stats: COMPLETE 
Column stats: NONE
@@ -1052,7 +1052,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 24 Data size: 2388 Basic stats: COMPLETE 
Column stats: NONE
@@ -1102,7 +1102,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE
@@ -1201,7 +1201,7 @@ STAGE PLANS:
               outputColumnNames: state, locid
               Statistics: Num rows: 8 Data size: 796 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), locid (type: int), 0 (type: bigint)
+                keys: state (type: string), locid (type: int), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 32 Data size: 3184 Basic stats: COMPLETE 
Column stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
index 78c4808..b983141 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
@@ -105,7 +105,7 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 200 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
bigint)
+                keys: state (type: string), country (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 80 Data size: 800 Basic stats: COMPLETE 
Column stats: NONE
@@ -253,7 +253,7 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 3460 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
bigint)
+                keys: state (type: string), country (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 40 Data size: 7240 Basic stats: COMPLETE 
Column stats: COMPLETE
@@ -352,7 +352,7 @@ STAGE PLANS:
               outputColumnNames: state, country
               Statistics: Num rows: 20 Data size: 3460 Basic stats: COMPLETE 
Column stats: COMPLETE
               Group By Operator
-                keys: state (type: string), country (type: string), 0 (type: 
bigint)
+                keys: state (type: string), country (type: string), 0L (type: 
bigint)
                 mode: hash
                 outputColumnNames: _col0, _col1, _col2
                 Statistics: Num rows: 80 Data size: 14480 Basic stats: 
COMPLETE Column stats: COMPLETE

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/annotate_stats_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out 
b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
index 9aaa6f6..cfec346 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
@@ -304,7 +304,7 @@ STAGE PLANS:
           alias: alltypes_orc
           Statistics: Num rows: 2 Data size: 1686 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: 11 (type: bigint)
+            expressions: 11L (type: bigint)
             outputColumnNames: _col0
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: COMPLETE
             ListSink
@@ -430,7 +430,7 @@ STAGE PLANS:
           alias: alltypes_orc
           Statistics: Num rows: 2 Data size: 1686 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: 1 (type: tinyint), 20 (type: smallint)
+            expressions: 1Y (type: tinyint), 20S (type: smallint)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 2 Data size: 16 Basic stats: COMPLETE Column 
stats: COMPLETE
             ListSink
@@ -451,7 +451,7 @@ STAGE PLANS:
           alias: alltypes_orc
           Statistics: Num rows: 2 Data size: 1686 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: 1970-12-31 15:59:58.174 (type: timestamp)
+            expressions: TIMESTAMP'1970-12-31 15:59:58.174' (type: timestamp)
             outputColumnNames: _col0
             Statistics: Num rows: 2 Data size: 80 Basic stats: COMPLETE Column 
stats: COMPLETE
             ListSink
@@ -472,7 +472,7 @@ STAGE PLANS:
           alias: alltypes_orc
           Statistics: Num rows: 2 Data size: 1686 Basic stats: COMPLETE Column 
stats: COMPLETE
           Select Operator
-            expressions: 1970-12-31 (type: date)
+            expressions: DATE'1970-12-31' (type: date)
             outputColumnNames: _col0
             Statistics: Num rows: 2 Data size: 112 Basic stats: COMPLETE 
Column stats: COMPLETE
             ListSink

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join11.q.out 
b/ql/src/test/results/clientpositive/auto_join11.q.out
index 7dd6af4..1beed50 100644
--- a/ql/src/test/results/clientpositive/auto_join11.q.out
+++ b/ql/src/test/results/clientpositive/auto_join11.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -50,7 +50,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join12.q.out 
b/ql/src/test/results/clientpositive/auto_join12.q.out
index 0e9fa98..7e4d39d 100644
--- a/ql/src/test/results/clientpositive/auto_join12.q.out
+++ b/ql/src/test/results/clientpositive/auto_join12.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 80.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -57,7 +57,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 80.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -76,7 +76,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 80.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 80.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join13.q.out 
b/ql/src/test/results/clientpositive/auto_join13.q.out
index 45a0a5e..bae1879 100644
--- a/ql/src/test/results/clientpositive/auto_join13.q.out
+++ b/ql/src/test/results/clientpositive/auto_join13.q.out
@@ -41,7 +41,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -56,7 +56,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -74,7 +74,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join14.q.out 
b/ql/src/test/results/clientpositive/auto_join14.q.out
index 52aaa02..6201071 100644
--- a/ql/src/test/results/clientpositive/auto_join14.q.out
+++ b/ql/src/test/results/clientpositive/auto_join14.q.out
@@ -34,7 +34,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 100.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -52,7 +52,7 @@ STAGE PLANS:
             alias: srcpart
             Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) > 100.0) (type: boolean)
+              predicate: (UDFToDouble(key) > 100.0D) (type: boolean)
               Statistics: Num rows: 333 Data size: 3537 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join16.q.out 
b/ql/src/test/results/clientpositive/auto_join16.q.out
index f05de41..3cd4376 100644
--- a/ql/src/test/results/clientpositive/auto_join16.q.out
+++ b/ql/src/test/results/clientpositive/auto_join16.q.out
@@ -32,7 +32,7 @@ STAGE PLANS:
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) > 20.0) and (UDFToDouble(value) < 
200.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(value) < 
200.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -50,7 +50,7 @@ STAGE PLANS:
             alias: tab
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((UDFToDouble(key) > 20.0) and (UDFToDouble(value) < 
200.0)) (type: boolean)
+              predicate: ((UDFToDouble(key) > 20.0D) and (UDFToDouble(value) < 
200.0D)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join27.q.out 
b/ql/src/test/results/clientpositive/auto_join27.q.out
index ba67d1a..1c5f573 100644
--- a/ql/src/test/results/clientpositive/auto_join27.q.out
+++ b/ql/src/test/results/clientpositive/auto_join27.q.out
@@ -37,7 +37,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: key (type: string), value (type: string)
@@ -78,7 +78,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
@@ -96,7 +96,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (UDFToDouble(key) < 200.0) (type: boolean)
+              predicate: (UDFToDouble(key) < 200.0D) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)

http://git-wip-us.apache.org/repos/asf/hive/blob/17441e48/ql/src/test/results/clientpositive/auto_join33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_join33.q.out 
b/ql/src/test/results/clientpositive/auto_join33.q.out
index a347fcd..c0eaecd 100644
--- a/ql/src/test/results/clientpositive/auto_join33.q.out
+++ b/ql/src/test/results/clientpositive/auto_join33.q.out
@@ -30,7 +30,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) + 1.0) < 10.0) and key is not 
null) (type: boolean)
+              predicate: (((UDFToDouble(key) + 1.0D) < 10.0D) and key is not 
null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -38,8 +38,8 @@ STAGE PLANS:
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 HashTable Sink Operator
                   keys:
-                    0 (UDFToDouble(_col0) + 1.0) (type: double)
-                    1 (UDFToDouble(_col0) + 2.0) (type: double)
+                    0 (UDFToDouble(_col0) + 1.0D) (type: double)
+                    1 (UDFToDouble(_col0) + 2.0D) (type: double)
 
   Stage: Stage-3
     Map Reduce
@@ -48,7 +48,7 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((UDFToDouble(key) + 2.0) < 10.0) and key is not 
null) (type: boolean)
+              predicate: (((UDFToDouble(key) + 2.0D) < 10.0D) and key is not 
null) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string), value (type: string)
@@ -58,8 +58,8 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                   keys:
-                    0 (UDFToDouble(_col0) + 1.0) (type: double)
-                    1 (UDFToDouble(_col0) + 2.0) (type: double)
+                    0 (UDFToDouble(_col0) + 1.0D) (type: double)
+                    1 (UDFToDouble(_col0) + 2.0D) (type: double)
                   outputColumnNames: _col0, _col1, _col2, _col3
                   Statistics: Num rows: 182 Data size: 1939 Basic stats: 
COMPLETE Column stats: NONE
                   File Output Operator

Reply via email to