Author: brock
Date: Mon Dec 29 02:13:57 2014
New Revision: 1648280

URL: http://svn.apache.org/r1648280
Log:
HIVE-9157 - Merge from trunk to spark 12/26/2014 [Spark Branch] (Post Merge 
Fixes)

Added:
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join0.q.java1.7.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.java1.7.out
Removed:
    hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/optimizer/optiq/
Modified:
    hive/branches/spark/data/conf/spark/log4j.properties
    
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionManagerImpl.java
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/add_part_multiple.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join10.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join11.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join12.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join14.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join16.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join17.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join19.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join20.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join21.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join22.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join23.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join24.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join26.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join27.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join28.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join29.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join30.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join31.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join32.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join8.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join9.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_reordering_values.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_stats.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_stats2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join_without_localtask.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_smb_mapjoin_14.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_10.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_11.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_12.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_14.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_15.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_sortmerge_join_9.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_spark1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_spark2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_spark3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_spark4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_tez1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucket_map_join_tez2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin10.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin11.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin12.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin8.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin9.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketmapjoin_negative3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/bucketsortoptimize_insert_8.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/column_access_stats.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_join.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_product_check_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/cross_product_check_2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ctas.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/disable_merge_for_bucketing.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/filter_join_breaktask.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/filter_join_breaktask2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_position.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/index_auto_self_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/innerjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/input_part2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join11.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join13.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join14.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join15.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join16.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join17.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join18.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join18_multi_distinct.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join19.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join20.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join21.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join22.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join23.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join25.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join26.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join27.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join28.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join29.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join30.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join31.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join32.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join33.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join34.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join35.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join36.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join37.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join38.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join39.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join40.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join41.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join9.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_alt_syntax.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_cond_pushdown_unqual4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_filters_overlap.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_hive_626.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_merge_multi_expressions.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_merging.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_nulls.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_nullsafe.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_rc.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_reorder4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_star.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/join_thrift.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_vc.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/join_view.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/limit_pushdown.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/load_dyn_part8.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/louter_join_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_decimal.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_distinct.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_filter_on_outerjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_mapjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_memcheck.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_subquery.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_subquery2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mapjoin_test_outer.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mergejoins.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/mergejoins_mixed.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_mixed.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_insert_move_tasks_share_dependencies.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/multi_join_union.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/optimize_nullscan.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/outer_join_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/parallel.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/parallel_join0.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/parallel_join1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/parquet_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/pcr.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_gby_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join3.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_join_filter.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_multi_insert.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_outer_join5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/ppd_transform.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/reduce_deduplicate_exclude_join.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/router_join_ppr.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample1.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample10.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample4.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample5.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample6.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample7.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/sample8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/semijoin.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_noskew.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoin_union_remove_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt10.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt11.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt12.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt14.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt15.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt16.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt17.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt18.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt19.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt20.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt8.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/skewjoinopt9.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin9.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_10.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_11.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_12.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_14.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_15.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_16.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_17.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_25.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/smb_mapjoin_7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_2.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_3.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_4.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_6.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_7.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/sort_merge_join_desc_8.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/stats0.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/stats12.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/stats13.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_exists.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_in.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/subquery_multiinsert.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/temp_table_join1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/tez_join_tests.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/tez_joins_explain.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/transform1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
    hive/branches/spark/ql/src/test/results/clientpositive/spark/union_ppr.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_cast_constant.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_decimal_mapjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_left_outer_join.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_mapjoin_reduce.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_orderby_5.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vector_string_concat.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_bucketmapjoin1.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_mapjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_nested_mapjoin.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_ptf.q.out
    
hive/branches/spark/ql/src/test/results/clientpositive/spark/vectorized_shufflejoin.q.out

Modified: hive/branches/spark/data/conf/spark/log4j.properties
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/data/conf/spark/log4j.properties?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- hive/branches/spark/data/conf/spark/log4j.properties (original)
+++ hive/branches/spark/data/conf/spark/log4j.properties Mon Dec 29 02:13:57 
2014
@@ -1,5 +1,6 @@
 log4j.rootCategory=DEBUG, DRFA
 
+hive.spark.log.dir=target/tmp/log
 # Settings to quiet third party logs that are too verbose
 log4j.logger.org.eclipse.jetty=WARN
 log4j.logger.org.eclipse.jetty.util.component.AbstractLifeCycle=ERROR

Modified: 
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionManagerImpl.java
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionManagerImpl.java?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionManagerImpl.java
 (original)
+++ 
hive/branches/spark/ql/src/java/org/apache/hadoop/hive/ql/exec/spark/session/SparkSessionManagerImpl.java
 Mon Dec 29 02:13:57 2014
@@ -139,10 +139,11 @@ public class SparkSessionManagerImpl imp
    */
   private boolean canReuseSession(SparkSession existingSession, HiveConf conf) 
throws HiveException {
     try {
-      UserGroupInformation newUgi = Utils.getUGIForConf(conf);
+      UserGroupInformation newUgi = Utils.getUGI();
       String newUserName = newUgi.getShortUserName();
 
-      UserGroupInformation ugiInSession = 
Utils.getUGIForConf(existingSession.getConf());
+      // TODOD this we need to store the session username somewhere else as 
getUGIForConf never used the conf
+      UserGroupInformation ugiInSession = Utils.getUGI();
       String userNameInSession = ugiInSession.getShortUserName();
 
       return newUserName.equals(userNameInSession);

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/add_part_multiple.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/add_part_multiple.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/add_part_multiple.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/add_part_multiple.q.out
 Mon Dec 29 02:13:57 2014
@@ -39,9 +39,7 @@ PARTITION (ds='2010-02-01') location 'B'
 PARTITION (ds='2010-03-01')
 PARTITION (ds='2010-04-01') location 'C'
 PREHOOK: type: ALTERTABLE_ADDPARTS
-PREHOOK: Input: A
-PREHOOK: Input: B
-PREHOOK: Input: C
+#### A masked pattern was here ####
 PREHOOK: Output: default@add_part_test
 POSTHOOK: query: ALTER TABLE add_part_test ADD IF NOT EXISTS
 PARTITION (ds='2010-01-01') location 'A'
@@ -49,9 +47,7 @@ PARTITION (ds='2010-02-01') location 'B'
 PARTITION (ds='2010-03-01')
 PARTITION (ds='2010-04-01') location 'C'
 POSTHOOK: type: ALTERTABLE_ADDPARTS
-POSTHOOK: Input: A
-POSTHOOK: Input: B
-POSTHOOK: Input: C
+#### A masked pattern was here ####
 POSTHOOK: Output: default@add_part_test
 POSTHOOK: Output: default@add_part_test@ds=2010-01-01
 POSTHOOK: Output: default@add_part_test@ds=2010-02-01

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/annotate_stats_join.q.out
 Mon Dec 29 02:13:57 2014
@@ -198,9 +198,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
@@ -272,9 +272,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
@@ -345,9 +345,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
@@ -419,9 +419,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
@@ -472,12 +472,16 @@ STAGE PLANS:
                   Filter Operator
                     predicate: deptid is not null (type: boolean)
                     Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: deptid (type: int)
+                    Select Operator
+                      expressions: lastname (type: string), deptid (type: 
int), locid (type: int)
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: lastname (type: string), locid (type: 
int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: int)
+                        Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col0 (type: string), _col2 (type: 
int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -486,45 +490,53 @@ STAGE PLANS:
                   Filter Operator
                     predicate: deptid is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: deptid (type: int)
+                    Select Operator
+                      expressions: deptid (type: int), deptname (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: deptname (type: string)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col1 (type: string)
         Map 4 
             Map Operator Tree:
                 TableScan
-                  alias: e1
+                  alias: e
                   Statistics: Num rows: 48 Data size: 552 Basic stats: 
COMPLETE Column stats: COMPLETE
                   Filter Operator
                     predicate: deptid is not null (type: boolean)
                     Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: deptid (type: int)
+                    Select Operator
+                      expressions: lastname (type: string), deptid (type: 
int), locid (type: int)
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: lastname (type: string), locid (type: 
int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: int)
+                        Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col0 (type: string), _col2 (type: 
int)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
                 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}
-                outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13
-                Statistics: Num rows: 658 Data size: 192794 Basic stats: 
COMPLETE Column stats: COMPLETE
+                keys:
+                  0 _col1 (type: int)
+                  1 _col0 (type: int)
+                  2 _col1 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
+                Statistics: Num rows: 1536 Data size: 152064 Basic stats: 
COMPLETE Column stats: COMPLETE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col6 (type: int), _col7 (type: string), _col11 (type: string), 
_col12 (type: int), _col13 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col3 (type: int), _col4 (type: string), _col5 (type: string), 
_col6 (type: int), _col7 (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7
-                  Statistics: Num rows: 658 Data size: 192794 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 1536 Data size: 152064 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 658 Data size: 192794 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1536 Data size: 152064 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -561,12 +573,16 @@ STAGE PLANS:
                   Filter Operator
                     predicate: deptid is not null (type: boolean)
                     Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: deptid (type: int)
+                    Select Operator
+                      expressions: lastname (type: string), deptid (type: 
int), locid (type: int)
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: lastname (type: string), locid (type: 
int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: int)
+                        Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col0 (type: string), _col2 (type: 
int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -575,12 +591,16 @@ STAGE PLANS:
                   Filter Operator
                     predicate: deptid is not null (type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: deptid (type: int)
+                    Select Operator
+                      expressions: deptid (type: int), deptname (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: deptname (type: string)
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col0 (type: int)
+                        Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col1 (type: string)
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -589,31 +609,35 @@ STAGE PLANS:
                   Filter Operator
                     predicate: locid is not null (type: boolean)
                     Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: locid (type: int)
-                      sort order: +
-                      Map-reduce partition columns: locid (type: int)
+                    Select Operator
+                      expressions: state (type: string), locid (type: int), 
zip (type: bigint), year (type: int)
+                      outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: state (type: string), zip (type: 
bigint), year (type: int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int)
+                        sort order: +
+                        Map-reduce partition columns: _col1 (type: int)
+                        Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col0 (type: string), _col2 (type: 
bigint), _col3 (type: int)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
                 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}
-                outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13, _col14
-                Statistics: Num rows: 47 Data size: 13912 Basic stats: 
COMPLETE Column stats: COMPLETE
+                keys:
+                  0 _col1 (type: int)
+                  1 _col0 (type: int)
+                  2 _col1 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 47 Data size: 4794 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col6 (type: int), _col7 (type: string), _col11 (type: string), 
_col12 (type: int), _col13 (type: bigint), _col14 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col3 (type: int), _col4 (type: string), _col5 (type: string), 
_col6 (type: int), _col7 (type: bigint), _col8 (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                  Statistics: Num rows: 47 Data size: 13912 Basic stats: 
COMPLETE Column stats: COMPLETE
+                  Statistics: Num rows: 47 Data size: 4794 Basic stats: 
COMPLETE Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 47 Data size: 13912 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 47 Data size: 4794 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -652,12 +676,16 @@ STAGE PLANS:
                   Filter Operator
                     predicate: (deptid is not null and lastname is not null) 
(type: boolean)
                     Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int), lastname (type: 
string)
-                      sort order: ++
-                      Map-reduce partition columns: deptid (type: int), 
lastname (type: string)
+                    Select Operator
+                      expressions: lastname (type: string), deptid (type: 
int), locid (type: int)
+                      outputColumnNames: _col0, _col1, _col2
                       Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: locid (type: int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int), _col0 (type: 
string)
+                        sort order: ++
+                        Map-reduce partition columns: _col1 (type: int), _col0 
(type: string)
+                        Statistics: Num rows: 48 Data size: 4752 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col2 (type: int)
         Map 3 
             Map Operator Tree:
                 TableScan
@@ -666,11 +694,15 @@ STAGE PLANS:
                   Filter Operator
                     predicate: (deptid is not null and deptname is not null) 
(type: boolean)
                     Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: deptid (type: int), deptname (type: 
string)
-                      sort order: ++
-                      Map-reduce partition columns: deptid (type: int), 
deptname (type: string)
+                    Select Operator
+                      expressions: deptid (type: int), deptname (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
+                      Reduce Output Operator
+                        key expressions: _col0 (type: int), _col1 (type: 
string)
+                        sort order: ++
+                        Map-reduce partition columns: _col0 (type: int), _col1 
(type: string)
+                        Statistics: Num rows: 6 Data size: 570 Basic stats: 
COMPLETE Column stats: COMPLETE
         Map 4 
             Map Operator Tree:
                 TableScan
@@ -679,31 +711,35 @@ STAGE PLANS:
                   Filter Operator
                     predicate: (locid is not null and state is not null) 
(type: boolean)
                     Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Reduce Output Operator
-                      key expressions: locid (type: int), state (type: string)
-                      sort order: ++
-                      Map-reduce partition columns: locid (type: int), state 
(type: string)
+                    Select Operator
+                      expressions: state (type: string), locid (type: int), 
zip (type: bigint), year (type: int)
+                      outputColumnNames: _col0, _col1, _col2, _col3
                       Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      value expressions: zip (type: bigint), year (type: int)
+                      Reduce Output Operator
+                        key expressions: _col1 (type: int), _col0 (type: 
string)
+                        sort order: ++
+                        Map-reduce partition columns: _col1 (type: int), _col0 
(type: string)
+                        Statistics: Num rows: 8 Data size: 804 Basic stats: 
COMPLETE Column stats: COMPLETE
+                        value expressions: _col2 (type: bigint), _col3 (type: 
int)
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
                 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}
-                outputColumnNames: _col0, _col1, _col2, _col6, _col7, _col11, 
_col12, _col13, _col14
-                Statistics: Num rows: 1 Data size: 296 Basic stats: COMPLETE 
Column stats: COMPLETE
+                keys:
+                  0 _col1 (type: int), _col0 (type: string)
+                  1 _col0 (type: int), _col1 (type: string)
+                  2 _col1 (type: int), _col0 (type: string)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
+                Statistics: Num rows: 1 Data size: 102 Basic stats: COMPLETE 
Column stats: COMPLETE
                 Select Operator
-                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col6 (type: int), _col7 (type: string), _col11 (type: string), 
_col12 (type: int), _col13 (type: bigint), _col14 (type: int)
+                  expressions: _col0 (type: string), _col1 (type: int), _col2 
(type: int), _col3 (type: int), _col4 (type: string), _col5 (type: string), 
_col6 (type: int), _col7 (type: bigint), _col8 (type: int)
                   outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8
-                  Statistics: Num rows: 1 Data size: 296 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  Statistics: Num rows: 1 Data size: 102 Basic stats: COMPLETE 
Column stats: COMPLETE
                   File Output Operator
                     compressed: false
-                    Statistics: Num rows: 1 Data size: 296 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    Statistics: Num rows: 1 Data size: 102 Basic stats: 
COMPLETE Column stats: COMPLETE
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
                         output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/authorization_admin_almighty1.q.out
 Mon Dec 29 02:13:57 2014
@@ -42,10 +42,10 @@ PREHOOK: query: show grant user user1 on
 PREHOOK: type: SHOW_GRANT
 POSTHOOK: query: show grant user user1 on table t1
 POSTHOOK: type: SHOW_GRANT
-default        t1                      user1   USER    DELETE  false   
1418683689000   hive_admin_user
-default        t1                      user1   USER    INSERT  false   
1418683689000   hive_admin_user
-default        t1                      user1   USER    SELECT  false   
1418683689000   hive_admin_user
-default        t1                      user1   USER    UPDATE  false   
1418683689000   hive_admin_user
+default        t1                      user1   USER    DELETE  false   
1419786901000   hive_admin_user
+default        t1                      user1   USER    INSERT  false   
1419786901000   hive_admin_user
+default        t1                      user1   USER    SELECT  false   
1419786901000   hive_admin_user
+default        t1                      user1   USER    UPDATE  false   
1419786901000   hive_admin_user
 PREHOOK: query: drop table t1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@t1

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join0.q.out 
Mon Dec 29 02:13:57 2014
@@ -44,9 +44,6 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0} {_col1}
-                          1 {_col0} {_col1}
                         keys:
                           0 
                           1 
@@ -75,9 +72,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join1.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join1.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join1.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join1.q.out 
Mon Dec 29 02:13:57 2014
@@ -34,9 +34,6 @@ STAGE PLANS:
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
-                      condition expressions:
-                        0 {key}
-                        1 {value}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -58,9 +55,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join10.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join10.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join10.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join10.q.out 
Mon Dec 29 02:13:57 2014
@@ -37,9 +37,6 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 
-                          1 {_col1}
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
@@ -67,9 +64,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join11.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join11.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join11.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join11.q.out 
Mon Dec 29 02:13:57 2014
@@ -37,9 +37,6 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0}
-                          1 {_col1}
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
@@ -67,9 +64,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join12.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join12.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join12.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join12.q.out 
Mon Dec 29 02:13:57 2014
@@ -30,27 +30,22 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 3 
+        Map 1 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (((key < 100) and (key < 80)) and key is not 
null) (type: boolean)
+                    predicate: (((UDFToDouble(key) < 80.0) and 
(UDFToDouble(key) < 100.0)) and key is not null) (type: boolean)
                     Statistics: Num rows: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: string), value (type: string)
-                      outputColumnNames: _col0, _col1
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
                       Statistics: Num rows: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0}
-                          1 {_col1}
-                          2 
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
-                          2 _col0 (type: string)
             Local Work:
               Map Reduce Local Work
         Map 4 
@@ -59,71 +54,77 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 100) and (key < 80)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
                       Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0}
-                          1 {_col1}
-                          2 
                         keys:
                           0 _col0 (type: string)
                           1 _col0 (type: string)
-                          2 _col0 (type: string)
             Local Work:
               Map Reduce Local Work
 
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
-        Map 1 
+        Map 2 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 80) and (key < 100)) (type: boolean)
+                    predicate: ((UDFToDouble(key) < 100.0) and 
(UDFToDouble(key) < 80.0)) (type: boolean)
                     Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                      expressions: key (type: string), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Map Join Operator
                         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)
-                          2 _col0 (type: string)
-                        outputColumnNames: _col0, _col3
+                        outputColumnNames: _col1, _col2
                         input vertices:
-                          1 Map 3
-                          2 Map 4
-                        Statistics: Num rows: 121 Data size: 1284 Basic stats: 
COMPLETE Column stats: NONE
-                        Group By Operator
-                          aggregations: sum(hash(_col0,_col3))
-                          mode: hash
-                          outputColumnNames: _col0
-                          Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                          Reduce Output Operator
-                            sort order: 
-                            Statistics: Num rows: 1 Data size: 8 Basic stats: 
COMPLETE Column stats: NONE
-                            value expressions: _col0 (type: bigint)
+                          1 Map 4
+                        Statistics: Num rows: 60 Data size: 642 Basic stats: 
COMPLETE Column stats: NONE
+                        Select Operator
+                          expressions: _col2 (type: string), _col1 (type: 
string)
+                          outputColumnNames: _col0, _col2
+                          Statistics: Num rows: 60 Data size: 642 Basic stats: 
COMPLETE Column stats: NONE
+                          Map Join Operator
+                            condition map:
+                                 Inner Join 0 to 1
+                            keys:
+                              0 _col0 (type: string)
+                              1 _col0 (type: string)
+                            outputColumnNames: _col1, _col3
+                            input vertices:
+                              0 Map 1
+                            Statistics: Num rows: 66 Data size: 706 Basic 
stats: COMPLETE Column stats: NONE
+                            Select Operator
+                              expressions: hash(_col1,_col3) (type: int)
+                              outputColumnNames: _col0
+                              Statistics: Num rows: 66 Data size: 706 Basic 
stats: COMPLETE Column stats: NONE
+                              Group By Operator
+                                aggregations: sum(_col0)
+                                mode: hash
+                                outputColumnNames: _col0
+                                Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
+                                Reduce Output Operator
+                                  sort order: 
+                                  Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
+                                  value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
-        Reducer 2 
+        Reducer 3 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join13.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join13.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join13.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join13.q.out 
Mon Dec 29 02:13:57 2014
@@ -30,25 +30,22 @@ STAGE PLANS:
     Spark
 #### A masked pattern was here ####
       Vertices:
-        Map 3 
+        Map 1 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key < 100) (type: boolean)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: ((UDFToDouble(key) < 200.0) and 
UDFToDouble(key) is not null) (type: boolean)
+                    Statistics: Num rows: 83 Data size: 881 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
+                      expressions: key (type: string)
+                      outputColumnNames: _col0
+                      Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0}
-                          1 {_col1}
                         keys:
-                          0 _col0 (type: string)
-                          1 _col0 (type: string)
+                          0 UDFToDouble(_col0) (type: double)
+                          1 (UDFToDouble(_col2) + UDFToDouble(_col0)) (type: 
double)
             Local Work:
               Map Reduce Local Work
         Map 4 
@@ -57,81 +54,76 @@ STAGE PLANS:
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((key < 200) and UDFToDouble(key) is not null) 
(type: boolean)
-                    Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: (UDFToDouble(key) < 100.0) (type: boolean)
+                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
                       expressions: key (type: string)
                       outputColumnNames: _col0
-                      Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 {_col0} {_col3}
-                          1 
                         keys:
-                          0 (_col0 + _col2) (type: double)
-                          1 UDFToDouble(_col0) (type: double)
+                          0 _col0 (type: string)
+                          1 _col0 (type: string)
             Local Work:
               Map Reduce Local Work
 
   Stage: Stage-1
     Spark
       Edges:
-        Reducer 2 <- Map 1 (GROUP, 1)
+        Reducer 3 <- Map 2 (GROUP, 1)
 #### A masked pattern was here ####
       Vertices:
-        Map 1 
+        Map 2 
             Map Operator Tree:
                 TableScan
                   alias: src
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: (key < 100) (type: boolean)
+                    predicate: (UDFToDouble(key) < 100.0) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Select Operator
-                      expressions: key (type: string)
-                      outputColumnNames: _col0
+                      expressions: key (type: string), value (type: string)
+                      outputColumnNames: _col0, _col1
                       Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       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)
-                        outputColumnNames: _col0, _col2, _col3
+                        outputColumnNames: _col0, _col1, _col2
                         input vertices:
-                          1 Map 3
+                          1 Map 4
                         Statistics: Num rows: 182 Data size: 1939 Basic stats: 
COMPLETE Column stats: NONE
                         Filter Operator
-                          predicate: (_col0 + _col2) is not null (type: 
boolean)
+                          predicate: (UDFToDouble(_col2) + UDFToDouble(_col0)) 
is not null (type: boolean)
                           Statistics: Num rows: 91 Data size: 969 Basic stats: 
COMPLETE Column stats: NONE
                           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)
-                            outputColumnNames: _col0, _col3
+                              0 UDFToDouble(_col0) (type: double)
+                              1 (UDFToDouble(_col2) + UDFToDouble(_col0)) 
(type: double)
+                            outputColumnNames: _col2, _col3
                             input vertices:
-                              1 Map 4
+                              0 Map 1
                             Statistics: Num rows: 100 Data size: 1065 Basic 
stats: COMPLETE Column stats: NONE
-                            Group By Operator
-                              aggregations: sum(hash(_col0,_col3))
-                              mode: hash
+                            Select Operator
+                              expressions: hash(_col3,_col2) (type: int)
                               outputColumnNames: _col0
-                              Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
-                              Reduce Output Operator
-                                sort order: 
+                              Statistics: Num rows: 100 Data size: 1065 Basic 
stats: COMPLETE Column stats: NONE
+                              Group By Operator
+                                aggregations: sum(_col0)
+                                mode: hash
+                                outputColumnNames: _col0
                                 Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
-                                value expressions: _col0 (type: bigint)
+                                Reduce Output Operator
+                                  sort order: 
+                                  Statistics: Num rows: 1 Data size: 8 Basic 
stats: COMPLETE Column stats: NONE
+                                  value expressions: _col0 (type: bigint)
             Local Work:
               Map Reduce Local Work
-        Reducer 2 
+        Reducer 3 
             Reduce Operator Tree:
               Group By Operator
                 aggregations: sum(VALUE._col0)

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join14.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join14.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join14.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join14.q.out 
Mon Dec 29 02:13:57 2014
@@ -38,9 +38,6 @@ STAGE PLANS:
                     predicate: (key > 100) (type: boolean)
                     Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
-                      condition expressions:
-                        0 
-                        1 {value}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -62,9 +59,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join15.q.out 
Mon Dec 29 02:13:57 2014
@@ -33,9 +33,6 @@ STAGE PLANS:
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
-                      condition expressions:
-                        0 {key} {value}
-                        1 {value}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -60,9 +57,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join16.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join16.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join16.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join16.q.out 
Mon Dec 29 02:13:57 2014
@@ -37,9 +37,6 @@ STAGE PLANS:
                       outputColumnNames: _col0, _col1
                       Statistics: Num rows: 9 Data size: 95 Basic stats: 
COMPLETE Column stats: NONE
                       Spark HashTable Sink Operator
-                        condition expressions:
-                          0 
-                          1 {value}
                         keys:
                           0 _col0 (type: string), _col1 (type: string)
                           1 key (type: string), value (type: string)
@@ -63,9 +60,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join17.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join17.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join17.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join17.q.out 
Mon Dec 29 02:13:57 2014
@@ -34,9 +34,6 @@ STAGE PLANS:
                     predicate: key is not null (type: boolean)
                     Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                     Spark HashTable Sink Operator
-                      condition expressions:
-                        0 {key} {value}
-                        1 {value}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -58,9 +55,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/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18.q.out 
Mon Dec 29 02:13:57 2014
@@ -86,23 +86,23 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint)
         Reducer 3 
             Reduce Operator Tree:
               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: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(hash(_col0,_col1,_col2,_col3))
                   mode: hash
@@ -137,12 +137,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 12 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 12 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: bigint)
 
   Stage: Stage-0

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
 (original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join18_multi_distinct.q.out
 Mon Dec 29 02:13:57 2014
@@ -88,23 +88,23 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col1 (type: bigint)
         Reducer 3 
             Reduce Operator Tree:
               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: 550 Data size: 5843 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: sum(hash(_col0,_col1,_col2,_col3,_col4))
                   mode: hash
@@ -139,12 +139,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 12 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 12 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
                   value expressions: _col1 (type: bigint), _col2 (type: bigint)
 
   Stage: Stage-0

Modified: 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join19.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join19.q.out?rev=1648280&r1=1648279&r2=1648280&view=diff
==============================================================================
--- 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join19.q.out 
(original)
+++ 
hive/branches/spark/ql/src/test/results/clientpositive/spark/auto_join19.q.out 
Mon Dec 29 02:13:57 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
                     Spark HashTable Sink Operator
-                      condition expressions:
-                        0 {key}
-                        1 {value}
                       keys:
                         0 key (type: string)
                         1 key (type: string)
@@ -60,9 +57,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)


Reply via email to