You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/12/11 21:28:08 UTC

svn commit: r1644752 [1/14] - in /hive/trunk: hbase-handler/src/test/results/positive/ ql/src/java/org/apache/hadoop/hive/ql/parse/ ql/src/java/org/apache/hadoop/hive/ql/plan/ ql/src/test/results/clientnegative/ ql/src/test/results/clientpositive/ ql/s...

Author: hashutosh
Date: Thu Dec 11 20:28:02 2014
New Revision: 1644752

URL: http://svn.apache.org/r1644752
Log:
HIVE-9037 : Improve explain plan to show joining keys for shuffle join (Ashutosh Chauhan via John Pullokkaran)

Modified:
    hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CommonMergeJoinDesc.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HashTableSinkDesc.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
    hive/trunk/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
    hive/trunk/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
    hive/trunk/ql/src/test/results/clientpositive/ambiguous_col.q.out
    hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join17.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join2.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join24.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join28.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join29.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join3.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join30.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join31.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join32.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join33.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join6.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join7.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join8.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join9.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join_reordering_values.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_join_without_localtask.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_smb_mapjoin_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_10.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketcontext_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/bucketsortoptimize_insert_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/cluster.q.out
    hive/trunk/ql/src/test/results/clientpositive/column_access_stats.q.out
    hive/trunk/ql/src/test/results/clientpositive/complex_alias.q.out
    hive/trunk/ql/src/test/results/clientpositive/constantPropagateForSubQuery.q.out
    hive/trunk/ql/src/test/results/clientpositive/constprog2.q.out
    hive/trunk/ql/src/test/results/clientpositive/constprog_partitioner.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer1.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer10.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer11.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer12.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer13.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer14.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer15.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer2.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer3.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer4.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer5.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer6.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer7.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer8.q.out
    hive/trunk/ql/src/test/results/clientpositive/correlationoptimizer9.q.out
    hive/trunk/ql/src/test/results/clientpositive/cross_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/cross_product_check_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/cross_product_check_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/decimal_join2.q.out
    hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out
    hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out
    hive/trunk/ql/src/test/results/clientpositive/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/gby_star.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_grouping_sets4.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_position.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/groupby_sort_skew_1_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap3.q.out
    hive/trunk/ql/src/test/results/clientpositive/index_bitmap_auto.q.out
    hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
    hive/trunk/ql/src/test/results/clientpositive/innerjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/input23.q.out
    hive/trunk/ql/src/test/results/clientpositive/input39.q.out
    hive/trunk/ql/src/test/results/clientpositive/join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/join10.q.out
    hive/trunk/ql/src/test/results/clientpositive/join11.q.out
    hive/trunk/ql/src/test/results/clientpositive/join12.q.out
    hive/trunk/ql/src/test/results/clientpositive/join13.q.out
    hive/trunk/ql/src/test/results/clientpositive/join14.q.out
    hive/trunk/ql/src/test/results/clientpositive/join15.q.out
    hive/trunk/ql/src/test/results/clientpositive/join16.q.out
    hive/trunk/ql/src/test/results/clientpositive/join17.q.out
    hive/trunk/ql/src/test/results/clientpositive/join18.q.out
    hive/trunk/ql/src/test/results/clientpositive/join18_multi_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/join19.q.out
    hive/trunk/ql/src/test/results/clientpositive/join2.q.out
    hive/trunk/ql/src/test/results/clientpositive/join20.q.out
    hive/trunk/ql/src/test/results/clientpositive/join21.q.out
    hive/trunk/ql/src/test/results/clientpositive/join22.q.out
    hive/trunk/ql/src/test/results/clientpositive/join23.q.out
    hive/trunk/ql/src/test/results/clientpositive/join25.q.out
    hive/trunk/ql/src/test/results/clientpositive/join26.q.out
    hive/trunk/ql/src/test/results/clientpositive/join27.q.out
    hive/trunk/ql/src/test/results/clientpositive/join28.q.out
    hive/trunk/ql/src/test/results/clientpositive/join29.q.out
    hive/trunk/ql/src/test/results/clientpositive/join3.q.out
    hive/trunk/ql/src/test/results/clientpositive/join30.q.out
    hive/trunk/ql/src/test/results/clientpositive/join31.q.out
    hive/trunk/ql/src/test/results/clientpositive/join32.q.out
    hive/trunk/ql/src/test/results/clientpositive/join32_lessSize.q.out
    hive/trunk/ql/src/test/results/clientpositive/join33.q.out
    hive/trunk/ql/src/test/results/clientpositive/join34.q.out
    hive/trunk/ql/src/test/results/clientpositive/join35.q.out
    hive/trunk/ql/src/test/results/clientpositive/join36.q.out
    hive/trunk/ql/src/test/results/clientpositive/join37.q.out
    hive/trunk/ql/src/test/results/clientpositive/join38.q.out
    hive/trunk/ql/src/test/results/clientpositive/join39.q.out
    hive/trunk/ql/src/test/results/clientpositive/join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/join40.q.out
    hive/trunk/ql/src/test/results/clientpositive/join41.q.out
    hive/trunk/ql/src/test/results/clientpositive/join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/join6.q.out
    hive/trunk/ql/src/test/results/clientpositive/join7.q.out
    hive/trunk/ql/src/test/results/clientpositive/join8.q.out
    hive/trunk/ql/src/test/results/clientpositive/join9.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_alt_syntax.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_unqual1.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_unqual2.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_unqual3.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_cond_pushdown_unqual4.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_filters_overlap.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_hive_626.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_map_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_merge_multi_expressions.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_merging.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_nullsafe.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_rc.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_reorder.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_reorder2.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_reorder3.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_reorder4.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_star.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_thrift.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_vc.q.out
    hive/trunk/ql/src/test/results/clientpositive/join_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/lateral_view_cp.q.out
    hive/trunk/ql/src/test/results/clientpositive/lateral_view_noalias.q.out
    hive/trunk/ql/src/test/results/clientpositive/limit_pushdown.q.out
    hive/trunk/ql/src/test/results/clientpositive/limit_pushdown_negative.q.out
    hive/trunk/ql/src/test/results/clientpositive/lineage1.q.out
    hive/trunk/ql/src/test/results/clientpositive/louter_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_distinct.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_filter_on_outerjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_memcheck.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_subquery.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_subquery2.q.out
    hive/trunk/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
    hive/trunk/ql/src/test/results/clientpositive/merge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/mergejoins.q.out
    hive/trunk/ql/src/test/results/clientpositive/mergejoins_mixed.q.out
    hive/trunk/ql/src/test/results/clientpositive/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/multiMapJoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/multiMapJoin2.q.out
    hive/trunk/ql/src/test/results/clientpositive/multi_join_union.q.out
    hive/trunk/ql/src/test/results/clientpositive/no_hooks.q.out
    hive/trunk/ql/src/test/results/clientpositive/nonblock_op_deduplicate.q.out
    hive/trunk/ql/src/test/results/clientpositive/nonmr_fetch.q.out
    hive/trunk/ql/src/test/results/clientpositive/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/optional_outer.q.out
    hive/trunk/ql/src/test/results/clientpositive/outer_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/parquet_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/pcr.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_clusterby.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_gby_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join3.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_join_filter.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_multi_insert.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join2.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join3.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join4.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_outer_join5.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_random.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_repeated_alias.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_udf_case.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_union_view.q.out
    hive/trunk/ql/src/test/results/clientpositive/ppd_vc.q.out
    hive/trunk/ql/src/test/results/clientpositive/ql_rewrite_gbtoidx.q.out
    hive/trunk/ql/src/test/results/clientpositive/quotedid_skew.q.out
    hive/trunk/ql/src/test/results/clientpositive/rcfile_null_value.q.out
    hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate_exclude_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/reduce_deduplicate_extended.q.out
    hive/trunk/ql/src/test/results/clientpositive/regex_col.q.out
    hive/trunk/ql/src/test/results/clientpositive/router_join_ppr.q.out
    hive/trunk/ql/src/test/results/clientpositive/sample8.q.out
    hive/trunk/ql/src/test/results/clientpositive/select_transform_hint.q.out
    hive/trunk/ql/src/test/results/clientpositive/semijoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin10.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin11.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin2.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin3.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin4.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin5.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin6.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin7.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin8.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_mapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_noskew.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_union_remove_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoin_union_remove_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt1.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt10.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt11.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt12.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt13.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt14.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt15.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt16.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt17.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt18.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt19.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt2.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt20.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt3.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt4.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt5.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt6.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt7.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt8.q.out
    hive/trunk/ql/src/test/results/clientpositive/skewjoinopt9.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin9.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_10.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_16.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_17.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_25.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/smb_mapjoin_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/sort_merge_join_desc_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats11.q.out
    hive/trunk/ql/src/test/results/clientpositive/subq_where_serialization.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_exists.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_exists_having.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_in.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_in_having.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_multiinsert.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_notexists.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_notexists_having.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_notin.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_notin_having.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
    hive/trunk/ql/src/test/results/clientpositive/subquery_views.q.out
    hive/trunk/ql/src/test/results/clientpositive/temp_table_join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_10.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_11.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_15.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_3.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_4.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_6.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_7.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_8.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_9.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket_map_join_tez1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/bucket_map_join_tez2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/correlationoptimizer1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/cross_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/cross_product_check_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/cross_product_check_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/dynamic_partition_pruning_2.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/filter_join_breaktask.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/join0.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/join1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/join_nullsafe.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/limit_pushdown.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_decimal.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/mapjoin_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/metadataonly1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/mrr.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/optimize_nullscan.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/skewjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/subquery_exists.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/subquery_in.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_bmj_schema_evolution.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_join_hash.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_join_tests.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_joins_explain.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_smb_1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_smb_main.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_union.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/tez_union_group_by.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vector_decimal_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vector_left_outer_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vector_mapjoin_reduce.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_bucketmapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_context.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_dynamic_partition_pruning.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_nested_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_ptf.q.out
    hive/trunk/ql/src/test/results/clientpositive/tez/vectorized_shufflejoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/udf_case_column_pruning.q.out
    hive/trunk/ql/src/test/results/clientpositive/union20.q.out
    hive/trunk/ql/src/test/results/clientpositive/union22.q.out
    hive/trunk/ql/src/test/results/clientpositive/union24.q.out
    hive/trunk/ql/src/test/results/clientpositive/union26.q.out
    hive/trunk/ql/src/test/results/clientpositive/union27.q.out
    hive/trunk/ql/src/test/results/clientpositive/union32.q.out
    hive/trunk/ql/src/test/results/clientpositive/union34.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_lateralview.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_remove_12.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_remove_13.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_remove_14.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_remove_23.q.out
    hive/trunk/ql/src/test/results/clientpositive/union_top_level.q.out
    hive/trunk/ql/src/test/results/clientpositive/vector_decimal_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/vector_left_outer_join.q.out
    hive/trunk/ql/src/test/results/clientpositive/vector_mapjoin_reduce.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_bucketmapjoin1.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_context.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_nested_mapjoin.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_ptf.q.out
    hive/trunk/ql/src/test/results/clientpositive/vectorized_shufflejoin.q.out

Modified: hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out (original)
+++ hive/trunk/hbase-handler/src/test/results/positive/hbase_queries.q.out Thu Dec 11 20:28:02 2014
@@ -152,9 +152,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 
-            1 {VALUE._col0} {VALUE._col1}
+          keys:
+            0 UDFToDouble(_col0) (type: double)
+            1 UDFToDouble(_col0) (type: double)
           outputColumnNames: _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -302,9 +302,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 
-            1 {KEY.reducesinkkey0} {VALUE._col0}
+          keys:
+            0 _col0 (type: int)
+            1 _col0 (type: int)
           outputColumnNames: _col2, _col3
           Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: NONE
           Select Operator
@@ -551,9 +551,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col1}
+          keys:
+            0 UDFToDouble(_col0) (type: double)
+            1 UDFToDouble(_col0) (type: double)
           outputColumnNames: _col0, _col1, _col3
           Statistics: Num rows: 137 Data size: 1460 Basic stats: COMPLETE Column stats: NONE
           Select Operator

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/parse/SemanticAnalyzer.java Thu Dec 11 20:28:02 2014
@@ -7175,7 +7175,7 @@ public class SemanticAnalyzer extends Ba
   }
 
   private Operator genJoinOperatorChildren(QBJoinTree join, Operator left,
-      Operator[] right, HashSet<Integer> omitOpts) throws SemanticException {
+      Operator[] right, HashSet<Integer> omitOpts, ExprNodeDesc[][] joinKeys) throws SemanticException {
 
     RowResolver outputRR = new RowResolver();
     ArrayList<String> outputColumnNames = new ArrayList<String>();
@@ -7269,7 +7269,7 @@ public class SemanticAnalyzer extends Ba
     }
 
     JoinDesc desc = new JoinDesc(exprMap, outputColumnNames,
-        join.getNoOuterJoin(), joinCondns, filterMap);
+        join.getNoOuterJoin(), joinCondns, filterMap, joinKeys);
     desc.setReversedExprs(reversedExprs);
     desc.setFilterMap(join.getFilterMap());
 
@@ -7470,7 +7470,7 @@ public class SemanticAnalyzer extends Ba
     }
 
     JoinOperator joinOp = (JoinOperator) genJoinOperatorChildren(joinTree,
-      joinSrcOp, srcOps, omitOpts);
+      joinSrcOp, srcOps, omitOpts, joinKeys);
     joinContext.put(joinOp, joinTree);
 
     Operator op = joinOp;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CommonMergeJoinDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CommonMergeJoinDesc.java?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CommonMergeJoinDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/CommonMergeJoinDesc.java Thu Dec 11 20:28:02 2014
@@ -20,7 +20,6 @@ package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
 
-
 @Explain(displayName = "Merge Join Operator")
 public class CommonMergeJoinDesc extends MapJoinDesc implements Serializable {
   private static final long serialVersionUID = 1L;

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HashTableSinkDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HashTableSinkDesc.java?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HashTableSinkDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/HashTableSinkDesc.java Thu Dec 11 20:28:02 2014
@@ -19,14 +19,10 @@
 package org.apache.hadoop.hive.ql.plan;
 
 import java.io.Serializable;
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
 
 import org.apache.hadoop.fs.Path;
 
@@ -117,21 +113,6 @@ public class HashTableSinkDesc extends J
     this.hashtableMemoryUsage = clone.getHashTableMemoryUsage();
   }
 
-
-  private void initRetainExprList() {
-    retainList = new HashMap<Byte, List<Integer>>();
-    Set<Entry<Byte, List<ExprNodeDesc>>> set = exprs.entrySet();
-    Iterator<Entry<Byte, List<ExprNodeDesc>>> setIter = set.iterator();
-    while (setIter.hasNext()) {
-      Entry<Byte, List<ExprNodeDesc>> current = setIter.next();
-      List<Integer> list = new ArrayList<Integer>();
-      for (int i = 0; i < current.getValue().size(); i++) {
-        list.add(i);
-      }
-      retainList.put(current.getKey(), list);
-    }
-  }
-
   public float getHashtableMemoryUsage() {
     return hashtableMemoryUsage;
   }

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/JoinDesc.java Thu Dec 11 20:28:02 2014
@@ -28,7 +28,6 @@ import java.util.Map;
 
 import org.apache.hadoop.fs.Path;
 
-
 /**
  * Join operator Descriptor implementation.
  *
@@ -87,17 +86,20 @@ public class JoinDesc extends AbstractOp
   // it's resulted from RS-dedup optimization, which removes following RS under some condition
   private boolean fixedAsSorted;
 
+  // used only for explain.
+  private transient ExprNodeDesc [][] joinKeys;
   public JoinDesc() {
   }
 
   public JoinDesc(final Map<Byte, List<ExprNodeDesc>> exprs,
       List<String> outputColumnNames, final boolean noOuterJoin,
-      final JoinCondDesc[] conds, final Map<Byte, List<ExprNodeDesc>> filters) {
+      final JoinCondDesc[] conds, final Map<Byte, List<ExprNodeDesc>> filters, ExprNodeDesc[][] joinKeys) {
     this.exprs = exprs;
     this.outputColumnNames = outputColumnNames;
     this.noOuterJoin = noOuterJoin;
     this.conds = conds;
     this.filters = filters;
+    this.joinKeys = joinKeys;
 
     resetOrder();
   }
@@ -157,22 +159,6 @@ public class JoinDesc extends AbstractOp
     return ret;
   }
 
-  public JoinDesc(final Map<Byte, List<ExprNodeDesc>> exprs,
-      List<String> outputColumnNames, final boolean noOuterJoin,
-      final JoinCondDesc[] conds) {
-    this(exprs, outputColumnNames, noOuterJoin, conds, null);
-  }
-
-  public JoinDesc(final Map<Byte, List<ExprNodeDesc>> exprs,
-      List<String> outputColumnNames) {
-    this(exprs, outputColumnNames, true, null);
-  }
-
-  public JoinDesc(final Map<Byte, List<ExprNodeDesc>> exprs,
-      List<String> outputColumnNames, final JoinCondDesc[] conds) {
-    this(exprs, outputColumnNames, true, conds, null);
-  }
-
   public JoinDesc(JoinDesc clone) {
     this.bigKeysDirMap = clone.bigKeysDirMap;
     this.conds = clone.conds;
@@ -204,33 +190,16 @@ public class JoinDesc extends AbstractOp
     this.reversedExprs = reversedExprs;
   }
 
-  @Explain(displayName = "condition expressions")
-  public Map<Byte, String> getExprsStringMap() {
-    if (getExprs() == null) {
-      return null;
-    }
-
-    LinkedHashMap<Byte, String> ret = new LinkedHashMap<Byte, String>();
-
-    for (Map.Entry<Byte, List<ExprNodeDesc>> ent : getExprs().entrySet()) {
-      StringBuilder sb = new StringBuilder();
-      boolean first = true;
-      if (ent.getValue() != null) {
-        for (ExprNodeDesc expr : ent.getValue()) {
-          if (!first) {
-            sb.append(" ");
-          }
-
-          first = false;
-          sb.append("{");
-          sb.append(expr.getExprString());
-          sb.append("}");
-        }
-      }
-      ret.put(ent.getKey(), sb.toString());
+  /**
+   * @return the keys in string form
+   */
+  @Explain(displayName = "keys")
+  public Map<Byte, String> getKeysString() {
+    Map<Byte, String> keyMap = new LinkedHashMap<Byte, String>();
+    for (byte i = 0; i < joinKeys.length; i++) {
+      keyMap.put(i, PlanUtils.getExprListString(Arrays.asList(joinKeys[i])));
     }
-
-    return ret;
+    return keyMap;
   }
 
   public void setExprs(final Map<Byte, List<ExprNodeDesc>> exprs) {

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/plan/MapJoinDesc.java Thu Dec 11 20:28:02 2014
@@ -98,7 +98,7 @@ public class MapJoinDesc extends JoinDes
       final List<TableDesc> valueTblDescs,final List<TableDesc> valueFilteredTblDescs,  List<String> outputColumnNames,
       final int posBigTable, final JoinCondDesc[] conds,
       final Map<Byte, List<ExprNodeDesc>> filters, boolean noOuterJoin, String dumpFilePrefix) {
-    super(values, outputColumnNames, noOuterJoin, conds, filters);
+    super(values, outputColumnNames, noOuterJoin, conds, filters, null);
     this.keys = keys;
     this.keyTblDesc = keyTblDesc;
     this.valueTblDescs = valueTblDescs;
@@ -192,6 +192,7 @@ public class MapJoinDesc extends JoinDes
   /**
    * @return the keys in string form
    */
+  @Override
   @Explain(displayName = "keys")
   public Map<Byte, String> getKeysString() {
     Map<Byte, String> keyMap = new LinkedHashMap<Byte, String>();
@@ -200,7 +201,7 @@ public class MapJoinDesc extends JoinDes
     }
     return keyMap;
   }
-   
+
   /**
    * @return the keys
    */
@@ -325,11 +326,11 @@ public class MapJoinDesc extends JoinDes
   public float getHashTableMemoryUsage() {
     return hashtableMemoryUsage;
   }
-  
+
   public void setCustomBucketMapJoin(boolean customBucketMapJoin) {
     this.customBucketMapJoin = customBucketMapJoin;
   }
-  
+
   public boolean getCustomBucketMapJoin() {
     return this.customBucketMapJoin;
   }

Modified: hive/trunk/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/bucket_mapjoin_mismatch1.q.out Thu Dec 11 20:28:02 2014
@@ -130,9 +130,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0}
-            1 {VALUE._col0}
+          keys:
+            0 key (type: int)
+            1 key (type: int)
           outputColumnNames: _col0, _col1, _col7
           Statistics: Num rows: 22 Data size: 2310 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -184,9 +184,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 15 Data size: 1583 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {key} {value}
-                  1 {value}
                 keys:
                   0 key (type: int)
                   1 key (type: int)
@@ -203,9 +200,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 {value}
                 keys:
                   0 key (type: int)
                   1 key (type: int)

Modified: hive/trunk/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientnegative/sortmerge_mapjoin_mismatch_1.q.out Thu Dec 11 20:28:02 2014
@@ -79,9 +79,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2406 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: int)
                   1 key (type: int)
@@ -98,9 +95,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: int)
                   1 key (type: int)

Modified: hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/allcolref_in_udf.q.out Thu Dec 11 20:28:02 2014
@@ -109,9 +109,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0} {VALUE._col1}
-            1 {VALUE._col0} {VALUE._col1}
+          keys:
+            0 (key + 1) (type: double)
+            1 UDFToDouble(key) (type: double)
           outputColumnNames: _col0, _col1, _col5, _col6
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/ambiguous_col.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/ambiguous_col.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/ambiguous_col.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/ambiguous_col.q.out Thu Dec 11 20:28:02 2014
@@ -47,9 +47,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0}
-            1 
+          keys:
+            0 _col0 (type: string)
+            1 _col0 (type: string)
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -118,9 +118,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 _col0 (type: string)
+            1 _col0 (type: string)
           outputColumnNames: _col0
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator
@@ -189,9 +189,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 _col0 (type: string)
+            1 _col0 (type: string)
           outputColumnNames: _col0
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join.q.out Thu Dec 11 20:28:02 2014
@@ -190,9 +190,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
-            1 {KEY.reducesinkkey0} {VALUE._col0}
+          keys:
+            0 deptid (type: int)
+            1 deptid (type: int)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 41 Data size: 7954 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -256,9 +256,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
+          keys:
+            0 deptid (type: int), lastname (type: string)
+            1 deptid (type: int), deptname (type: string)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 6 Data size: 1164 Basic stats: COMPLETE Column stats: COMPLETE
           Filter Operator
@@ -321,9 +321,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
+          keys:
+            0 deptid (type: int), lastname (type: string)
+            1 deptid (type: int), deptname (type: string)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 6 Data size: 1164 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -387,9 +387,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
+          keys:
+            0 deptid (type: int), lastname (type: string), lastname (type: string)
+            1 deptid (type: int), deptname (type: string), deptname (type: string)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7
           Statistics: Num rows: 11 Data size: 2134 Basic stats: COMPLETE Column stats: COMPLETE
           Filter Operator
@@ -470,10 +470,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 0 to 2
-          condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
-            1 {KEY.reducesinkkey0} {VALUE._col0}
-            2 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
+          keys:
+            0 deptid (type: int)
+            1 deptid (type: int)
+            2 deptid (type: int)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, _col12, _col13
           Statistics: Num rows: 658 Data size: 192794 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -549,10 +549,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 0 to 2
-          condition expressions:
-            0 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1}
-            1 {KEY.reducesinkkey0} {VALUE._col0}
-            2 {VALUE._col0} {KEY.reducesinkkey0} {VALUE._col1} {VALUE._col2}
+          keys:
+            0 deptid (type: int)
+            1 deptid (type: int)
+            2 locid (type: int)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, _col12, _col13, _col14
           Statistics: Num rows: 47 Data size: 13912 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -629,10 +629,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 0 to 2
-          condition expressions:
-            0 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {KEY.reducesinkkey1}
-            2 {KEY.reducesinkkey1} {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
+          keys:
+            0 deptid (type: int), lastname (type: string)
+            1 deptid (type: int), deptname (type: string)
+            2 locid (type: int), state (type: string)
           outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, _col12, _col13, _col14
           Statistics: Num rows: 1 Data size: 296 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out Thu Dec 11 20:28:02 2014
@@ -298,9 +298,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 964 Data size: 3856 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -359,9 +359,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 111 Data size: 444 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -420,9 +420,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 107 Data size: 428 Basic stats: COMPLETE Column stats: PARTIAL
           Select Operator
@@ -481,9 +481,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 322 Data size: 1288 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -542,9 +542,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 321 Data size: 1284 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -615,10 +615,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 1 to 2
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
-            2 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
+            2 s_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 964 Data size: 3856 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -689,10 +689,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 1 to 2
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
-            2 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
+            2 s_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 38 Data size: 152 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -763,10 +763,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 1 to 2
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
-            2 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
+            2 s_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 322 Data size: 1288 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -837,10 +837,10 @@ STAGE PLANS:
           condition map:
                Inner Join 0 to 1
                Inner Join 1 to 2
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 
-            2 
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
+            2 s_store_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 321 Data size: 1284 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator
@@ -901,9 +901,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0}
-            1 {VALUE._col6}
+          keys:
+            0 s_store_sk (type: int)
+            1 ss_store_sk (type: int)
           outputColumnNames: _col0, _col38
           Statistics: Num rows: 916 Data size: 7328 Basic stats: COMPLETE Column stats: COMPLETE
           File Output Operator
@@ -938,9 +938,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Inner Join 0 to 1
-          condition expressions:
-            0 {VALUE._col0}
-            1 
+          keys:
+            0 _col38 (type: int)
+            1 ca_address_sk (type: int)
           outputColumnNames: _col0
           Statistics: Num rows: 210 Data size: 840 Basic stats: COMPLETE Column stats: COMPLETE
           Select Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join0.q.out Thu Dec 11 20:28:02 2014
@@ -47,9 +47,6 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 {_col0} {_col1}
-                    1 {_col0} {_col1}
                   keys:
                     0 
                     1 
@@ -70,9 +67,6 @@ STAGE PLANS:
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
-                  condition expressions:
-                    0 {_col0} {_col1}
-                    1 {_col0} {_col1}
                   keys:
                     0 
                     1 

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join1.q.out Thu Dec 11 20:28:02 2014
@@ -36,9 +36,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -55,9 +52,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key}
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join10.q.out Thu Dec 11 20:28:02 2014
@@ -39,9 +39,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {_col0} {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -62,9 +59,6 @@ STAGE PLANS:
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
-                  condition expressions:
-                    0 
-                    1 {_col0} {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join11.q.out Thu Dec 11 20:28:02 2014
@@ -39,9 +39,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -62,9 +59,6 @@ STAGE PLANS:
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
-                  condition expressions:
-                    0 {_col0}
-                    1 {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join12.q.out Thu Dec 11 20:28:02 2014
@@ -48,10 +48,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {_col1}
-                    2 
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -68,10 +64,6 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {_col1}
-                    2 
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -94,10 +86,6 @@ STAGE PLANS:
                   condition map:
                        Inner Join 0 to 1
                        Inner Join 0 to 2
-                  condition expressions:
-                    0 {_col0}
-                    1 {_col1}
-                    2 
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join13.q.out Thu Dec 11 20:28:02 2014
@@ -48,9 +48,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {_col0} {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -66,9 +63,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 {_col0} {_col3}
-                    1 
                   keys:
                     0 (_col0 + _col2) (type: double)
                     1 UDFToDouble(_col0) (type: double)
@@ -89,9 +83,6 @@ STAGE PLANS:
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
-                  condition expressions:
-                    0 {_col0}
-                    1 {_col0} {_col1}
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -103,9 +94,6 @@ STAGE PLANS:
                     Map Join Operator
                       condition map:
                            Inner Join 0 to 1
-                      condition expressions:
-                        0 {_col0} {_col3}
-                        1 
                       keys:
                         0 (_col0 + _col2) (type: double)
                         1 UDFToDouble(_col0) (type: double)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join14.q.out Thu Dec 11 20:28:02 2014
@@ -40,9 +40,6 @@ STAGE PLANS:
               predicate: (key > 100) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -59,9 +56,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key}
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join15.q.out Thu Dec 11 20:28:02 2014
@@ -36,9 +36,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -55,9 +52,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join16.q.out Thu Dec 11 20:28:02 2014
@@ -39,9 +39,6 @@ STAGE PLANS:
                 outputColumnNames: _col0, _col1
                 Statistics: Num rows: 9 Data size: 95 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 {value}
                   keys:
                     0 _col0 (type: string), _col1 (type: string)
                     1 key (type: string), value (type: string)
@@ -58,9 +55,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {_col0}
-                  1 {value}
                 keys:
                   0 _col0 (type: string), _col1 (type: string)
                   1 key (type: string), value (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join17.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join17.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join17.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join17.q.out Thu Dec 11 20:28:02 2014
@@ -36,9 +36,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -55,9 +52,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 {key} {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join18.q.out Thu Dec 11 20:28:02 2014
@@ -89,9 +89,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Outer Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {VALUE._col0}
+          keys:
+            0 _col0 (type: string)
+            1 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Group By Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join18_multi_distinct.q.out Thu Dec 11 20:28:02 2014
@@ -91,9 +91,9 @@ STAGE PLANS:
         Join Operator
           condition map:
                Outer Join 0 to 1
-          condition expressions:
-            0 {KEY.reducesinkkey0} {VALUE._col0}
-            1 {KEY.reducesinkkey0} {VALUE._col0} {VALUE._col1}
+          keys:
+            0 _col0 (type: string)
+            1 _col0 (type: string)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4
           Statistics: Num rows: 275 Data size: 2921 Basic stats: COMPLETE Column stats: NONE
           Group By Operator

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join19.q.out Thu Dec 11 20:28:02 2014
@@ -38,9 +38,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {key}
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -57,9 +54,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key}
-                  1 {value}
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join2.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join2.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join2.q.out Thu Dec 11 20:28:02 2014
@@ -39,9 +39,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 {key}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -53,9 +50,6 @@ STAGE PLANS:
               predicate: UDFToDouble(key) is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {_col0}
-                  1 {value}
                 keys:
                   0 (_col0 + _col5) (type: double)
                   1 UDFToDouble(key) (type: double)
@@ -72,9 +66,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key}
-                  1 {key}
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -86,9 +77,6 @@ STAGE PLANS:
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
-                    condition expressions:
-                      0 {_col0}
-                      1 {value}
                     keys:
                       0 (_col0 + _col5) (type: double)
                       1 UDFToDouble(key) (type: double)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join20.q.out Thu Dec 11 20:28:02 2014
@@ -39,10 +39,6 @@ STAGE PLANS:
               predicate: (key < 10) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {value}
-                  2 {key} {value}
                 filter predicates:
                   0 
                   1 
@@ -59,10 +55,6 @@ STAGE PLANS:
               predicate: (key < 10) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {value}
-                  2 {key} {value}
                 filter predicates:
                   0 
                   1 
@@ -82,10 +74,6 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
                    Right Outer Join0 to 2
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
               filter predicates:
                 0 
                 1 
@@ -215,10 +203,6 @@ STAGE PLANS:
               predicate: ((key < 15) and (key < 10)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {value}
-                  2 {key} {value}
                 filter predicates:
                   0 
                   1 
@@ -235,10 +219,6 @@ STAGE PLANS:
               predicate: ((key < 10) and (key < 15)) (type: boolean)
               Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {value}
-                  2 {key} {value}
                 filter predicates:
                   0 
                   1 
@@ -258,10 +238,6 @@ STAGE PLANS:
               condition map:
                    Inner Join 0 to 1
                    Right Outer Join0 to 2
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
               filter predicates:
                 0 
                 1 

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join21.q.out Thu Dec 11 20:28:02 2014
@@ -25,10 +25,6 @@ STAGE PLANS:
             alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
-              condition expressions:
-                0 {value}
-                1 {value}
-                2 {key} {value}
               filter predicates:
                 0 {(key < 10)}
                 1 
@@ -45,10 +41,6 @@ STAGE PLANS:
               predicate: (key > 10) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 {value}
-                  2 {key} {value}
                 filter predicates:
                   0 {(key < 10)}
                   1 
@@ -68,10 +60,6 @@ STAGE PLANS:
               condition map:
                    Left Outer Join0 to 1
                    Right Outer Join1 to 2
-              condition expressions:
-                0 {key} {value}
-                1 {key} {value}
-                2 {key} {value}
               filter predicates:
                 0 {(key < 10)}
                 1 

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join22.q.out Thu Dec 11 20:28:02 2014
@@ -28,9 +28,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {value}
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -42,9 +39,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 {_col3}
                 keys:
                   0 key (type: string)
                   1 _col2 (type: string)
@@ -61,9 +55,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -76,9 +67,6 @@ STAGE PLANS:
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
-                    condition expressions:
-                      0 
-                      1 {_col3}
                     keys:
                       0 key (type: string)
                       1 _col2 (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join23.q.out Thu Dec 11 20:28:02 2014
@@ -26,9 +26,6 @@ STAGE PLANS:
               predicate: (key < 10) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {key} {value}
-                  1 {key} {value}
                 keys:
                   0 
                   1 
@@ -45,9 +42,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key} {value}
-                  1 {key} {value}
                 keys:
                   0 
                   1 

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join24.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join24.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join24.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join24.q.out Thu Dec 11 20:28:02 2014
@@ -45,9 +45,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 155 Data size: 743 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 {cnt}
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -64,9 +61,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {cnt}
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join26.q.out Thu Dec 11 20:28:02 2014
@@ -40,9 +40,6 @@ STAGE PLANS:
               predicate: key is not null (type: boolean)
               Statistics: Num rows: 13 Data size: 99 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
-                condition expressions:
-                  0 
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)
@@ -59,9 +56,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 {key}
-                  1 
                 keys:
                   0 key (type: string)
                   1 key (type: string)

Modified: hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out?rev=1644752&r1=1644751&r2=1644752&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/auto_join27.q.out Thu Dec 11 20:28:02 2014
@@ -85,9 +85,6 @@ STAGE PLANS:
                 outputColumnNames: _col0
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE Column stats: NONE
                 HashTable Sink Operator
-                  condition expressions:
-                    0 
-                    1 
                   keys:
                     0 _col0 (type: string)
                     1 _col0 (type: string)
@@ -110,9 +107,6 @@ STAGE PLANS:
                   Map Join Operator
                     condition map:
                          Inner Join 0 to 1
-                    condition expressions:
-                      0 
-                      1 
                     keys:
                       0 _col0 (type: string)
                       1 _col0 (type: string)
@@ -134,9 +128,6 @@ STAGE PLANS:
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
-                condition expressions:
-                  0 
-                  1 
                 keys:
                   0 _col0 (type: string)
                   1 _col0 (type: string)