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 2016/05/06 20:56:07 UTC

[15/15] hive git commit: HIVE-13542 : Missing stats for tables in TPCDS performance regression suite (Hari Subramaniyan via Ashutosh Chauhan)

HIVE-13542 : Missing stats for tables in TPCDS performance regression suite (Hari Subramaniyan via Ashutosh Chauhan)

Signed-off-by: Ashutosh Chauhan <ha...@apache.org>


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

Branch: refs/heads/master
Commit: db8a6db9993376139a17f5fd275d874c0c48506d
Parents: 92a9ae8
Author: Hari Subramaniyan <ha...@apache.org>
Authored: Thu May 5 11:03:00 2016 -0800
Committer: Ashutosh Chauhan <ha...@apache.org>
Committed: Fri May 6 13:54:30 2016 -0700

----------------------------------------------------------------------
 data/conf/perf-reg/hive-site.xml                |    5 -
 .../metastore_export/csv/TABLE_PARAMS.txt       |   41 +
 .../metastore_export/csv/TAB_COL_STATS.txt      |  168 ++-
 .../org/apache/hadoop/hive/ql/QTestUtil.java    |   10 +-
 .../results/clientpositive/perf/query12.q.out   |   28 +-
 .../results/clientpositive/perf/query13.q.out   |  166 +--
 .../results/clientpositive/perf/query15.q.out   |   62 +-
 .../results/clientpositive/perf/query17.q.out   |  230 ++--
 .../results/clientpositive/perf/query18.q.out   |  208 ++--
 .../results/clientpositive/perf/query19.q.out   |  160 +--
 .../results/clientpositive/perf/query20.q.out   |   66 +-
 .../results/clientpositive/perf/query21.q.out   |   56 +-
 .../results/clientpositive/perf/query22.q.out   |   62 +-
 .../results/clientpositive/perf/query25.q.out   |  238 ++--
 .../results/clientpositive/perf/query26.q.out   |   74 +-
 .../results/clientpositive/perf/query27.q.out   |  148 ++-
 .../results/clientpositive/perf/query28.q.out   |   60 +-
 .../results/clientpositive/perf/query29.q.out   |  238 ++--
 .../results/clientpositive/perf/query3.q.out    |   92 +-
 .../results/clientpositive/perf/query31.q.out   |  592 ++++-----
 .../results/clientpositive/perf/query32.q.out   |  164 +--
 .../results/clientpositive/perf/query34.q.out   |  124 +-
 .../results/clientpositive/perf/query39.q.out   |  150 +--
 .../results/clientpositive/perf/query40.q.out   |   64 +-
 .../results/clientpositive/perf/query42.q.out   |   46 +-
 .../results/clientpositive/perf/query43.q.out   |   44 +-
 .../results/clientpositive/perf/query45.q.out   |  190 ++-
 .../results/clientpositive/perf/query46.q.out   |  220 ++--
 .../results/clientpositive/perf/query48.q.out   |  142 +--
 .../results/clientpositive/perf/query50.q.out   |   68 +-
 .../results/clientpositive/perf/query51.q.out   |   62 +-
 .../results/clientpositive/perf/query52.q.out   |   46 +-
 .../results/clientpositive/perf/query54.q.out   |  298 ++---
 .../results/clientpositive/perf/query55.q.out   |   48 +-
 .../results/clientpositive/perf/query58.q.out   |  368 +++---
 .../results/clientpositive/perf/query64.q.out   | 1170 +++++++++---------
 .../results/clientpositive/perf/query65.q.out   |  224 ++--
 .../results/clientpositive/perf/query66.q.out   |  160 +--
 .../results/clientpositive/perf/query67.q.out   |   34 +-
 .../results/clientpositive/perf/query68.q.out   |  220 ++--
 .../results/clientpositive/perf/query7.q.out    |   74 +-
 .../results/clientpositive/perf/query70.q.out   |   96 +-
 .../results/clientpositive/perf/query71.q.out   |  240 ++--
 .../results/clientpositive/perf/query72.q.out   |  294 ++---
 .../results/clientpositive/perf/query73.q.out   |  124 +-
 .../results/clientpositive/perf/query75.q.out   |  390 +++---
 .../results/clientpositive/perf/query76.q.out   |   76 +-
 .../results/clientpositive/perf/query79.q.out   |  114 +-
 .../results/clientpositive/perf/query80.q.out   |  254 ++--
 .../results/clientpositive/perf/query82.q.out   |   96 +-
 .../results/clientpositive/perf/query84.q.out   |  144 +--
 .../results/clientpositive/perf/query85.q.out   |  242 ++--
 .../results/clientpositive/perf/query87.q.out   |  246 ++--
 .../results/clientpositive/perf/query88.q.out   |  902 +++++++-------
 .../results/clientpositive/perf/query89.q.out   |   66 +-
 .../results/clientpositive/perf/query90.q.out   |   88 +-
 .../results/clientpositive/perf/query91.q.out   |  204 +--
 .../results/clientpositive/perf/query92.q.out   |   34 +-
 .../results/clientpositive/perf/query93.q.out   |   62 +-
 .../results/clientpositive/perf/query94.q.out   |  106 +-
 .../results/clientpositive/perf/query95.q.out   |  172 +--
 .../results/clientpositive/perf/query96.q.out   |   42 +-
 .../results/clientpositive/perf/query97.q.out   |   34 +-
 .../results/clientpositive/perf/query98.q.out   |   64 +-
 64 files changed, 5494 insertions(+), 5216 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/data/conf/perf-reg/hive-site.xml
----------------------------------------------------------------------
diff --git a/data/conf/perf-reg/hive-site.xml b/data/conf/perf-reg/hive-site.xml
index 77bbe91..9e929fc 100644
--- a/data/conf/perf-reg/hive-site.xml
+++ b/data/conf/perf-reg/hive-site.xml
@@ -268,11 +268,6 @@
 </property>
 
 <property>
-  <name>hive.metastore.fastpath</name>
-  <value>true</value>
-</property>
-
-<property>
   <name>hive.metastore.rawstore.impl</name>
   <value>org.apache.hadoop.hive.metastore.ObjectStore</value>
 </property>

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/data/files/tpcds-perf/metastore_export/csv/TABLE_PARAMS.txt
----------------------------------------------------------------------
diff --git a/data/files/tpcds-perf/metastore_export/csv/TABLE_PARAMS.txt b/data/files/tpcds-perf/metastore_export/csv/TABLE_PARAMS.txt
index 9aa385a..a669e2e 100644
--- a/data/files/tpcds-perf/metastore_export/csv/TABLE_PARAMS.txt
+++ b/data/files/tpcds-perf/metastore_export/csv/TABLE_PARAMS.txt
@@ -100,3 +100,44 @@ _web_site_,numRows,84
 _web_site_,rawDataSize,155408
 _web_site_,totalSize,11271
 _web_site_,transient_lastDdlTime,1434562107
+_catalog_returns_,COLUMN_STATS_ACCURATE,true
+_catalog_returns_,numFiles,400
+_catalog_returns_,numRows,28798881
+_catalog_returns_,rawDataSize,3057234680
+_catalog_returns_,totalSize,1651022096
+_catalog_sales_,COLUMN_STATS_ACCURATE,true
+_catalog_sales_,numFiles,552
+_catalog_sales_,numRows,287989836
+_catalog_sales_,rawDataSize,38999608952
+_catalog_sales_,totalSize,16430853294
+_catalog_sales_,transient_lastDdlTime,1434700893
+_inventory_,COLUMN_STATS_ACCURATE,true
+_inventory_,numFiles,51
+_inventory_,numRows,37584000
+_inventory_,rawDataSize,593821104
+_inventory_,totalSize,58323594
+_inventory_,transient_lastDdlTime,1434681166
+_store_sales_,COLUMN_STATS_ACCURATE,true
+_store_sales_,numFiles,600
+_store_sales_,numRows,575995635
+_store_sales_,rawDataSize,50814502088
+_store_sales_,totalSize,22288384284
+_store_sales_,transient_lastDdlTime,1434700760
+_web_sales_,COLUMN_STATS_ACCURATE,true
+_web_sales_,numFiles,529
+_web_sales_,numRows,144002668
+_web_sales_,rawDataSize,19580198212
+_web_sales_,totalSize,8304889016
+_web_sales_,transient_lastDdlTime,1434700829
+_web_returns_,COLUMN_STATS_ACCURATE,true
+_web_returns_,numFiles,135
+_web_returns_,numRows,14398467
+_web_returns_,rawDataSize,1325194184
+_web_returns_,totalSize,827734274
+_web_returns_,transient_lastDdlTime,1434700842
+_store_returns_,COLUMN_STATS_ACCURATE,true
+_store_returns_,numFiles,573
+_store_returns_,numRows,57591150
+_store_returns_,rawDataSize,4462194832
+_store_returns_,totalSize,2683203627
+_store_returns_,transient_lastDdlTime,1434700790

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/data/files/tpcds-perf/metastore_export/csv/TAB_COL_STATS.txt
----------------------------------------------------------------------
diff --git a/data/files/tpcds-perf/metastore_export/csv/TAB_COL_STATS.txt b/data/files/tpcds-perf/metastore_export/csv/TAB_COL_STATS.txt
index a1e54fd..2b0dd01 100644
--- a/data/files/tpcds-perf/metastore_export/csv/TAB_COL_STATS.txt
+++ b/data/files/tpcds-perf/metastore_export/csv/TAB_COL_STATS.txt
@@ -98,7 +98,7 @@ default,customer_address,ca_zip,string,,,,,,,10141,0,4.849962,5,,,1434571715,629
 default,customer_address,ca_country,string,,,,,,,2,0,12.610234325,13,,,1434571715,6293,_customer_address_
 default,customer_address,ca_gmt_offset,float,,,-10,-5,,,5,1201179,,,,,1434571715,6294,_customer_address_
 default,customer_address,ca_location_type,string,,,,,,,4,0,8.729921525,13,,,1434571715,6295,_customer_address_
-default,customer_demographics,cd_demo_sk,int,1,_time_dim_800,,,,,1835839,0,,,,,1434571729,6296,_customer_demographics_
+default,customer_demographics,cd_demo_sk,int,1,1920800,,,,,1835839,0,,,,,1434571729,6296,_customer_demographics_
 default,customer_demographics,cd_gender,string,,,,,,,2,0,1,1,,,1434571729,6297,_customer_demographics_
 default,customer_demographics,cd_marital_status,string,,,,,,,7,0,1,1,,,1434571729,6298,_customer_demographics_
 default,customer_demographics,cd_education_status,string,,,,,,,9,0,9.57142857142857,15,,,1434571729,6299,_customer_demographics_
@@ -257,3 +257,169 @@ default,web_site,web_zip,string,,,,,,,56,0,5,5,,,1434572787,6451,_web_site_
 default,web_site,web_country,string,,,,,,,2,0,12.8452380952381,13,,,1434572787,6452,_web_site_
 default,web_site,web_gmt_offset,float,,,-8,-5,,,3,1,,,,,1434572787,6453,_web_site_
 default,web_site,web_tax_percentage,float,,,0,0.119999997317791,,,17,1,,,,,1434572787,6454,_web_site_
+default,catalog_returns,cr_returned_date_sk,int,2450821,2452924,,,,,2535,0,,,,,1434701010,7142,_catalog_returns_
+default,catalog_returns,cr_returned_time_sk,int,0,86399,,,,,125124,0,,,,,1434701010,7143,_catalog_returns_
+default,catalog_returns,cr_item_sk,int,1,48000,,,,,62562,0,,,,,1434701010,7144,_catalog_returns_
+default,catalog_returns,cr_refunded_customer_sk,int,1,1600000,,,,,1415625,575640,,,,,1434701010,7145,_catalog_returns_
+default,catalog_returns,cr_refunded_cdemo_sk,int,1,1920800,,,,,1835839,576793,,,,,1434701010,7146,_catalog_returns_
+default,catalog_returns,cr_refunded_hdemo_sk,int,1,7200,,,,,9299,576604,,,,,1434701010,7147,_catalog_returns_
+default,catalog_returns,cr_refunded_addr_sk,int,1,800000,,,,,707812,576661,,,,,1434701010,7148,_catalog_returns_
+default,catalog_returns,cr_returning_customer_sk,int,1,1600000,,,,,1415625,575663,,,,,1434701010,7149,_catalog_returns_
+default,catalog_returns,cr_returning_cdemo_sk,int,1,1920800,,,,,1835839,576462,,,,,1434701010,7150,_catalog_returns_
+default,catalog_returns,cr_returning_hdemo_sk,int,1,7200,,,,,9299,577306,,,,,1434701010,7151,_catalog_returns_
+default,catalog_returns,cr_returning_addr_sk,int,1,800000,,,,,707812,577349,,,,,1434701010,7152,_catalog_returns_
+default,catalog_returns,cr_call_center_sk,int,1,8,,,,,9,576152,,,,,1434701010,7153,_catalog_returns_
+default,catalog_returns,cr_catalog_page_sk,int,1,9828,,,,,7488,577076,,,,,1434701010,7154,_catalog_returns_
+default,catalog_returns,cr_ship_mode_sk,int,1,20,,,,,18,576040,,,,,1434701010,7155,_catalog_returns_
+default,catalog_returns,cr_warehouse_sk,int,1,6,,,,,5,576830,,,,,1434701010,7156,_catalog_returns_
+default,catalog_returns,cr_reason_sk,int,1,37,,,,,24,576949,,,,,1434701010,7157,_catalog_returns_
+default,catalog_returns,cr_order_number,int,2,31999999,,,,,18238808,0,,,,,1434701010,7158,_catalog_returns_
+default,catalog_returns,cr_return_quantity,int,1,100,,,,,63,576244,,,,,1434701010,7159,_catalog_returns_
+default,catalog_returns,cr_return_amount,float,,,0,28778.310546875,,,1139925,576461,,,,,1434701010,7160,_catalog_returns_
+default,catalog_returns,cr_return_tax,float,,,0,2391.1201171875,,,130664,577147,,,,,1434701010,7161,_catalog_returns_
+default,catalog_returns,cr_return_amt_inc_tax,float,,,0,29677.359375,,,1758005,576846,,,,,1434701010,7162,_catalog_returns_
+default,catalog_returns,cr_fee,float,,,0.5,100,,,12060,576294,,,,,1434701010,7163,_catalog_returns_
+default,catalog_returns,cr_return_ship_cost,float,,,0,14130.9599609375,,,595197,576784,,,,,1434701010,7164,_catalog_returns_
+default,catalog_returns,cr_refunded_cash,float,,,0,25606.5390625,,,1139925,575637,,,,,1434701010,7165,_catalog_returns_
+default,catalog_returns,cr_reversed_charge,float,,,0,23801.240234375,,,649067,577379,,,,,1434701010,7166,_catalog_returns_
+default,catalog_returns,cr_store_credit,float,,,0,22653.91015625,,,621548,576505,,,,,1434701010,7167,_catalog_returns_
+default,catalog_returns,cr_net_loss,float,,,0.5,15781.830078125,,,1091596,576295,,,,,1434701010,7168,_catalog_returns_
+default,catalog_sales,cs_sold_date_sk,int,2450815,2452654,,,,,2226,1440109,,,,,1434701053,7169,_catalog_sales_
+default,catalog_sales,cs_sold_time_sk,int,0,86399,,,,,125124,1439981,,,,,1434701053,7170,_catalog_sales_
+default,catalog_sales,cs_ship_date_sk,int,2450817,2452744,,,,,2324,1439858,,,,,1434701053,7171,_catalog_sales_
+default,catalog_sales,cs_bill_customer_sk,int,1,1600000,,,,,1415625,1439092,,,,,1434701053,7172,_catalog_sales_
+default,catalog_sales,cs_bill_cdemo_sk,int,1,1920800,,,,,1835839,1440094,,,,,1434701053,7173,_catalog_sales_
+default,catalog_sales,cs_bill_hdemo_sk,int,1,7200,,,,,9299,1438041,,,,,1434701053,7174,_catalog_sales_
+default,catalog_sales,cs_bill_addr_sk,int,1,800000,,,,,707812,1439191,,,,,1434701053,7175,_catalog_sales_
+default,catalog_sales,cs_ship_customer_sk,int,1,1600000,,,,,1415625,1441690,,,,,1434701053,7176,_catalog_sales_
+default,catalog_sales,cs_ship_cdemo_sk,int,1,1920800,,,,,1835839,1439916,,,,,1434701053,7177,_catalog_sales_
+default,catalog_sales,cs_ship_hdemo_sk,int,1,7200,,,,,9299,1441155,,,,,1434701053,7178,_catalog_sales_
+default,catalog_sales,cs_ship_addr_sk,int,1,800000,,,,,707812,1437501,,,,,1434701053,7179,_catalog_sales_
+default,catalog_sales,cs_call_center_sk,int,1,8,,,,,9,1438943,,,,,1434701053,7180,_catalog_sales_
+default,catalog_sales,cs_catalog_page_sk,int,1,9828,,,,,7488,1439230,,,,,1434701053,7181,_catalog_sales_
+default,catalog_sales,cs_ship_mode_sk,int,1,20,,,,,18,1439234,,,,,1434701053,7182,_catalog_sales_
+default,catalog_sales,cs_warehouse_sk,int,1,6,,,,,5,1441117,,,,,1434701053,7183,_catalog_sales_
+default,catalog_sales,cs_item_sk,int,1,48000,,,,,62562,0,,,,,1434701053,7184,_catalog_sales_
+default,catalog_sales,cs_promo_sk,int,1,450,,,,,224,1440151,,,,,1434701053,7185,_catalog_sales_
+default,catalog_sales,cs_order_number,int,1,32000000,,,,,45300013,0,,,,,1434701053,7186,_catalog_sales_
+default,catalog_sales,cs_quantity,int,1,100,,,,,63,1439531,,,,,1434701053,7187,_catalog_sales_
+default,catalog_sales,cs_wholesale_cost,float,,,1,100,,,12060,1440635,,,,,1434701053,7188,_catalog_sales_
+default,catalog_sales,cs_list_price,float,,,1,300,,,27468,1440771,,,,,1434701053,7189,_catalog_sales_
+default,catalog_sales,cs_sales_price,float,,,0,300,,,27468,1439327,,,,,1434701053,7190,_catalog_sales_
+default,catalog_sales,cs_ext_discount_amt,float,,,0,29767,,,1543750,1440329,,,,,1434701053,7191,_catalog_sales_
+default,catalog_sales,cs_ext_sales_price,float,,,0,29943,,,1612098,1439296,,,,,1434701053,7192,_catalog_sales_
+default,catalog_sales,cs_ext_wholesale_cost,float,,,1,10000,,,545798,1439858,,,,,1434701053,7193,_catalog_sales_
+default,catalog_sales,cs_ext_list_price,float,,,1,30000,,,1612098,1439697,,,,,1434701053,7194,_catalog_sales_
+default,catalog_sales,cs_ext_tax,float,,,0,2673.27001953125,,,284981,1439788,,,,,1434701053,7195,_catalog_sales_
+default,catalog_sales,cs_coupon_amt,float,,,0,28422.939453125,,,2090632,1439246,,,,,1434701053,7196,_catalog_sales_
+default,catalog_sales,cs_ext_ship_cost,float,,,0,14994,,,771875,1439291,,,,,1434701053,7197,_catalog_sales_
+default,catalog_sales,cs_net_paid,float,,,0,29943,,,2711215,1439634,,,,,1434701053,7198,_catalog_sales_
+default,catalog_sales,cs_net_paid_inc_tax,float,,,0,32376.26953125,,,2956601,1439480,,,,,1434701053,7199,_catalog_sales_
+default,catalog_sales,cs_net_paid_inc_ship,float,,,0,43725,,,2956601,0,,,,,1434701053,7200,_catalog_sales_
+default,catalog_sales,cs_net_paid_inc_ship_tax,float,,,0,45460.80078125,,,3087500,0,,,,,1434701053,7201,_catalog_sales_
+default,catalog_sales,cs_net_profit,float,,,-10000,19962,,,2183192,0,,,,,1434701053,7202,_catalog_sales_
+default,inventory,inv_date_sk,int,2450815,2452635,,,,,316,0,,,,,1434681195,6879,_inventory_
+default,inventory,inv_item_sk,int,1,48000,,,,,62562,0,,,,,1434681195,6880,_inventory_
+default,inventory,inv_warehouse_sk,int,1,6,,,,,5,0,,,,,1434681195,6881,_inventory_
+default,inventory,inv_quantity_on_hand,int,0,1000,,,,,691,1880724,,,,,1434681195,6882,_inventory_
+default,store_sales,ss_sold_date_sk,int,2450816,2452642,,,,,2226,25919081,,,,,1434701145,7281,_store_sales_
+default,store_sales,ss_sold_time_sk,int,28800,75599,,,,,74399,25917462,,,,,1434701145,7282,_store_sales_
+default,store_sales,ss_item_sk,int,1,48000,,,,,62562,0,,,,,1434701145,7283,_store_sales_
+default,store_sales,ss_customer_sk,int,1,1600000,,,,,1415625,25915323,,,,,1434701145,7284,_store_sales_
+default,store_sales,ss_cdemo_sk,int,1,1920800,,,,,1835839,25919854,,,,,1434701145,7285,_store_sales_
+default,store_sales,ss_hdemo_sk,int,1,7200,,,,,9299,25915104,,,,,1434701145,7286,_store_sales_
+default,store_sales,ss_addr_sk,int,1,800000,,,,,707812,25915529,,,,,1434701145,7287,_store_sales_
+default,store_sales,ss_store_sk,int,1,212,,,,,90,25912696,,,,,1434701145,7288,_store_sales_
+default,store_sales,ss_promo_sk,int,1,450,,,,,224,25916282,,,,,1434701145,7289,_store_sales_
+default,store_sales,ss_ticket_number,int,1,48000000,,,,,56256175,0,,,,,1434701145,7290,_store_sales_
+default,store_sales,ss_quantity,int,1,100,,,,,63,25915535,,,,,1434701145,7291,_store_sales_
+default,store_sales,ss_wholesale_cost,float,,,1,100,,,12060,25919883,,,,,1434701145,7292,_store_sales_
+default,store_sales,ss_list_price,float,,,1,200,,,17056,25917233,,,,,1434701145,7293,_store_sales_
+default,store_sales,ss_sales_price,float,,,0,200,,,17056,25920715,,,,,1434701145,7294,_store_sales_
+default,store_sales,ss_ext_discount_amt,float,,,0,19225,,,1298134,25919240,,,,,1434701145,7295,_store_sales_
+default,store_sales,ss_ext_sales_price,float,,,0,19884,,,1139925,25919038,,,,,1434701145,7296,_store_sales_
+default,store_sales,ss_ext_wholesale_cost,float,,,1,10000,,,545798,25922497,,,,,1434701145,7297,_store_sales_
+default,store_sales,ss_ext_list_price,float,,,1,20000,,,1139925,25914179,,,,,1434701145,7298,_store_sales_
+default,store_sales,ss_ext_tax,float,,,0,1789.56005859375,,,219750,25918655,,,,,1434701145,7299,_store_sales_
+default,store_sales,ss_coupon_amt,float,,,0,19225,,,1298134,25919240,,,,,1434701145,7300,_store_sales_
+default,store_sales,ss_net_paid,float,,,0,19884,,,1917118,25919162,,,,,1434701145,7301,_store_sales_
+default,store_sales,ss_net_paid_inc_tax,float,,,0,21673.560546875,,,2380788,25925354,,,,,1434701145,7302,_store_sales_
+default,store_sales,ss_net_profit,float,,,-10000,9942,,,2380788,25912021,,,,,1434701145,7303,_store_sales_
+default,web_sales,ws_sold_date_sk,int,2450816,2452642,,,,,2226,35804,,,,,1434701088,7227,_web_sales_
+default,web_sales,ws_sold_time_sk,int,0,86399,,,,,125124,36037,,,,,1434701088,7228,_web_sales_
+default,web_sales,ws_ship_date_sk,int,2450817,2452762,,,,,2324,35780,,,,,1434701088,7229,_web_sales_
+default,web_sales,ws_item_sk,int,1,48000,,,,,62562,0,,,,,1434701088,7230,_web_sales_
+default,web_sales,ws_bill_customer_sk,int,1,1600000,,,,,1415625,35880,,,,,1434701088,7231,_web_sales_
+default,web_sales,ws_bill_cdemo_sk,int,1,1920800,,,,,1835839,35762,,,,,1434701088,7232,_web_sales_
+default,web_sales,ws_bill_hdemo_sk,int,1,7200,,,,,9299,36012,,,,,1434701088,7233,_web_sales_
+default,web_sales,ws_bill_addr_sk,int,1,800000,,,,,707812,35627,,,,,1434701088,7234,_web_sales_
+default,web_sales,ws_ship_customer_sk,int,1,1600000,,,,,1415625,35897,,,,,1434701088,7235,_web_sales_
+default,web_sales,ws_ship_cdemo_sk,int,1,1920800,,,,,1835839,35783,,,,,1434701088,7236,_web_sales_
+default,web_sales,ws_ship_hdemo_sk,int,1,7200,,,,,9299,35810,,,,,1434701088,7237,_web_sales_
+default,web_sales,ws_ship_addr_sk,int,1,800000,,,,,707812,35897,,,,,1434701088,7238,_web_sales_
+default,web_sales,ws_web_page_sk,int,1,342,,,,,205,35737,,,,,1434701088,7239,_web_sales_
+default,web_sales,ws_web_site_sk,int,1,38,,,,,25,35999,,,,,1434701088,7240,_web_sales_
+default,web_sales,ws_ship_mode_sk,int,1,20,,,,,18,35802,,,,,1434701088,7241,_web_sales_
+default,web_sales,ws_warehouse_sk,int,1,6,,,,,5,35925,,,,,1434701088,7242,_web_sales_
+default,web_sales,ws_promo_sk,int,1,450,,,,,224,36123,,,,,1434701088,7243,_web_sales_
+default,web_sales,ws_order_number,int,1,12000000,,,,,14686712,0,,,,,1434701088,7244,_web_sales_
+default,web_sales,ws_quantity,int,1,100,,,,,63,36054,,,,,1434701088,7245,_web_sales_
+default,web_sales,ws_wholesale_cost,float,,,1,100,,,12060,35939,,,,,1434701088,7246,_web_sales_
+default,web_sales,ws_list_price,float,,,1,300,,,27468,35970,,,,,1434701088,7247,_web_sales_
+default,web_sales,ws_sales_price,float,,,0,300,,,27468,35995,,,,,1434701088,7248,_web_sales_
+default,web_sales,ws_ext_discount_amt,float,,,0,29982,,,1543750,35968,,,,,1434701088,7249,_web_sales_
+default,web_sales,ws_ext_sales_price,float,,,0,29810,,,1415625,35945,,,,,1434701088,7250,_web_sales_
+default,web_sales,ws_ext_wholesale_cost,float,,,1,10000,,,545798,35704,,,,,1434701088,7251,_web_sales_
+default,web_sales,ws_ext_list_price,float,,,1.00999999046326,29997,,,1612098,36119,,,,,1434701088,7252,_web_sales_
+default,web_sales,ws_ext_tax,float,,,0,2682.89990234375,,,297598,35785,,,,,1434701088,7253,_web_sales_
+default,web_sales,ws_coupon_amt,float,,,0,27737.8203125,,,1612098,35986,,,,,1434701088,7254,_web_sales_
+default,web_sales,ws_ext_ship_cost,float,,,0,14927,,,677803,35929,,,,,1434701088,7255,_web_sales_
+default,web_sales,ws_net_paid,float,,,0,29810,,,2486195,35796,,,,,1434701088,7256,_web_sales_
+default,web_sales,ws_net_paid_inc_tax,float,,,0,32492.900390625,,,2596268,36094,,,,,1434701088,7257,_web_sales_
+default,web_sales,ws_net_paid_inc_ship,float,,,0,43674.83984375,,,2956601,0,,,,,1434701088,7258,_web_sales_
+default,web_sales,ws_net_paid_inc_ship_tax,float,,,0,46004.19140625,,,2956601,0,,,,,1434701088,7259,_web_sales_
+default,web_sales,ws_net_profit,float,,,-10000,19840,,,2090632,0,,,,,1434701088,7260,_web_sales_
+default,web_returns,wr_returned_date_sk,int,2450820,2453002,,,,,2647,648651,,,,,1434701060,7203,_web_returns_
+default,web_returns,wr_returned_time_sk,int,0,86399,,,,,125124,647816,,,,,1434701060,7204,_web_returns_
+default,web_returns,wr_item_sk,int,1,48000,,,,,62562,0,,,,,1434701060,7205,_web_returns_
+default,web_returns,wr_refunded_customer_sk,int,1,1600000,,,,,1415625,648741,,,,,1434701060,7206,_web_returns_
+default,web_returns,wr_refunded_cdemo_sk,int,1,1920800,,,,,1835839,648047,,,,,1434701060,7207,_web_returns_
+default,web_returns,wr_refunded_hdemo_sk,int,1,7200,,,,,9299,648703,,,,,1434701060,7208,_web_returns_
+default,web_returns,wr_refunded_addr_sk,int,1,800000,,,,,707812,648992,,,,,1434701060,7209,_web_returns_
+default,web_returns,wr_returning_customer_sk,int,1,1600000,,,,,1415625,648657,,,,,1434701060,7210,_web_returns_
+default,web_returns,wr_returning_cdemo_sk,int,1,1920800,,,,,1835839,648182,,,,,1434701060,7211,_web_returns_
+default,web_returns,wr_returning_hdemo_sk,int,1,7200,,,,,9299,648115,,,,,1434701060,7212,_web_returns_
+default,web_returns,wr_returning_addr_sk,int,1,800000,,,,,707812,648259,,,,,1434701060,7213,_web_returns_
+default,web_returns,wr_web_page_sk,int,1,342,,,,,205,649350,,,,,1434701060,7214,_web_returns_
+default,web_returns,wr_reason_sk,int,1,37,,,,,24,647884,,,,,1434701060,7215,_web_returns_
+default,web_returns,wr_order_number,int,1,11999999,,,,,8007986,0,,,,,1434701060,7216,_web_returns_
+default,web_returns,wr_return_quantity,int,1,100,,,,,63,648184,,,,,1434701060,7217,_web_returns_
+default,web_returns,wr_return_amt,float,,,0,28346.310546875,,,841735,648139,,,,,1434701060,7218,_web_returns_
+default,web_returns,wr_return_tax,float,,,0,2551.15991210938,,,105216,647420,,,,,1434701060,7219,_web_returns_
+default,web_returns,wr_return_amt_inc_tax,float,,,0,29493.380859375,,,1543750,647910,,,,,1434701060,7220,_web_returns_
+default,web_returns,wr_fee,float,,,0.5,100,,,12060,647879,,,,,1434701060,7221,_web_returns_
+default,web_returns,wr_return_ship_cost,float,,,0,14043.66015625,,,479279,647276,,,,,1434701060,7222,_web_returns_
+default,web_returns,wr_refunded_cash,float,,,0,26466.560546875,,,649067,649282,,,,,1434701060,7223,_web_returns_
+default,web_returns,wr_reversed_charge,float,,,0,22972.359375,,,545798,648744,,,,,1434701060,7224,_web_returns_
+default,web_returns,wr_account_credit,float,,,0,23166.330078125,,,439501,649368,,,,,1434701060,7225,_web_returns_
+default,web_returns,wr_net_loss,float,,,0.5,15068.9599609375,,,739150,649063,,,,,1434701060,7226,_web_returns_
+default,store_returns,sr_returned_date_sk,int,2450820,2452822,,,,,2324,2013145,,,,,1434701098,7261,_store_returns_
+default,store_returns,sr_return_time_sk,int,28799,61199,,,,,46196,2016532,,,,,1434701098,7262,_store_returns_
+default,store_returns,sr_item_sk,int,1,48000,,,,,62562,0,,,,,1434701098,7263,_store_returns_
+default,store_returns,sr_customer_sk,int,1,1600000,,,,,1415625,2016349,,,,,1434701098,7264,_store_returns_
+default,store_returns,sr_cdemo_sk,int,1,1920800,,,,,1835839,2013452,,,,,1434701098,7265,_store_returns_
+default,store_returns,sr_hdemo_sk,int,1,7200,,,,,9299,2015074,,,,,1434701098,7266,_store_returns_
+default,store_returns,sr_addr_sk,int,1,800000,,,,,707812,2015595,,,,,1434701098,7267,_store_returns_
+default,store_returns,sr_store_sk,int,1,212,,,,,90,2013530,,,,,1434701098,7268,_store_returns_
+default,store_returns,sr_reason_sk,int,1,37,,,,,24,2016587,,,,,1434701098,7269,_store_returns_
+default,store_returns,sr_ticket_number,int,1,48000000,,,,,34931085,0,,,,,1434701098,7270,_store_returns_
+default,store_returns,sr_return_quantity,int,1,100,,,,,63,2016579,,,,,1434701098,7271,_store_returns_
+default,store_returns,sr_return_amt,float,,,0,19387.169921875,,,841735,2015073,,,,,1434701098,7272,_store_returns_
+default,store_returns,sr_return_tax,float,,,0,1682.0400390625,,,114739,2014835,,,,,1434701098,7273,_store_returns_
+default,store_returns,sr_return_amt_inc_tax,float,,,0,20371.390625,,,1139925,2014852,,,,,1434701098,7274,_store_returns_
+default,store_returns,sr_fee,float,,,0.5,100,,,12060,2015809,,,,,1434701098,7275,_store_returns_
+default,store_returns,sr_return_ship_cost,float,,,0,9578.25,,,500499,2015477,,,,,1434701098,7276,_store_returns_
+default,store_returns,sr_refunded_cash,float,,,0,17556.94921875,,,917919,2015507,,,,,1434701098,7277,_store_returns_
+default,store_returns,sr_reversed_charge,float,,,0,16099.51953125,,,739150,2017819,,,,,1434701098,7278,_store_returns_
+default,store_returns,sr_store_credit,float,,,0,15642.1103515625,,,771875,2013589,,,,,1434701098,7279,_store_returns_
+default,store_returns,sr_net_loss,float,,,0.5,10447.7197265625,,,879002,2014488,,,,,1434701098,7280,_store_returns_

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
----------------------------------------------------------------------
diff --git a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
index a6e8efa..9863d6c 100644
--- a/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
+++ b/itests/util/src/main/java/org/apache/hadoop/hive/ql/QTestUtil.java
@@ -2090,14 +2090,16 @@ public class QTestUtil {
         }
       }
       for (Map.Entry<String, Integer> entry : tableNameToID.entrySet()) {
-        String toReplace = "_" + entry.getKey() + "_" ;
-        String replacementString = ""+entry.getValue();
+        String toReplace1 = ",_" + entry.getKey() + "_" ;
+        String replacementString1 = ","+entry.getValue();
+        String toReplace2 = "_" + entry.getKey() + "_," ;
+        String replacementString2 = ""+entry.getValue()+",";
         try {
           String content1 = FileUtils.readFileToString(tmpFileLoc1, "UTF-8");
-          content1 = content1.replaceAll(toReplace, replacementString);
+          content1 = content1.replaceAll(toReplace1, replacementString1);
           FileUtils.writeStringToFile(tmpFileLoc1, content1, "UTF-8");
           String content2 = FileUtils.readFileToString(tmpFileLoc2, "UTF-8");
-          content2 = content2.replaceAll(toReplace, replacementString);
+          content2 = content2.replaceAll(toReplace2, replacementString2);
           FileUtils.writeStringToFile(tmpFileLoc2, content2, "UTF-8");
         } catch (IOException e) {
           LOG.info("Generating file failed", e);

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/ql/src/test/results/clientpositive/perf/query12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query12.q.out b/ql/src/test/results/clientpositive/perf/query12.q.out
index 986a307..8b05edb 100644
--- a/ql/src/test/results/clientpositive/perf/query12.q.out
+++ b/ql/src/test/results/clientpositive/perf/query12.q.out
@@ -15,33 +15,33 @@ Stage-0
     Stage-1
       Reducer 6
       File Output Operator [FS_26]
-        Limit [LIM_25] (rows=100 width=1436)
+        Limit [LIM_25] (rows=100 width=135)
           Number of rows:100
-          Select Operator [SEL_24] (rows=34938 width=1436)
+          Select Operator [SEL_24] (rows=21780404 width=135)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_23]
-              Select Operator [SEL_21] (rows=34938 width=1436)
+              Select Operator [SEL_21] (rows=21780404 width=135)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6"]
-                PTF Operator [PTF_20] (rows=34938 width=1436)
+                PTF Operator [PTF_20] (rows=21780404 width=135)
                   Function definitions:[{},{"name:":"windowingtablefunction","order by:":"_col3 ASC NULLS FIRST","partition by:":"_col3"}]
-                  Select Operator [SEL_19] (rows=34938 width=1436)
+                  Select Operator [SEL_19] (rows=21780404 width=135)
                     Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
                   <-Reducer 4 [SIMPLE_EDGE]
                     SHUFFLE [RS_18]
                       PartitionCols:_col3
-                      Group By Operator [GBY_17] (rows=34938 width=1436)
+                      Group By Operator [GBY_17] (rows=21780404 width=135)
                         Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0, KEY._col1, KEY._col2, KEY._col3, KEY._col4
                       <-Reducer 3 [SIMPLE_EDGE]
                         SHUFFLE [RS_16]
                           PartitionCols:_col0, _col1, _col2, _col3, _col4
-                          Group By Operator [GBY_15] (rows=69877 width=1436)
+                          Group By Operator [GBY_15] (rows=43560808 width=135)
                             Output:["_col0","_col1","_col2","_col3","_col4","_col5"],aggregations:["sum(_col23)"],keys:_col38, _col41, _col49, _col47, _col42
-                            Select Operator [SEL_14] (rows=69877 width=1436)
+                            Select Operator [SEL_14] (rows=43560808 width=135)
                               Output:["_col38","_col41","_col49","_col47","_col42","_col23"]
-                              Filter Operator [FIL_32] (rows=69877 width=1436)
+                              Filter Operator [FIL_32] (rows=43560808 width=135)
                                 predicate:((_col3 = _col37) and (_col0 = _col62))
-                                Merge Join Operator [MERGEJOIN_37] (rows=279510 width=1436)
+                                Merge Join Operator [MERGEJOIN_37] (rows=174243235 width=135)
                                   Conds:RS_9._col0=RS_11.d_date_sk(Inner),Output:["_col0","_col3","_col23","_col37","_col38","_col41","_col42","_col47","_col49","_col62"]
                                 <-Map 8 [SIMPLE_EDGE]
                                   SHUFFLE [RS_11]
@@ -53,15 +53,15 @@ Stage-0
                                 <-Reducer 2 [SIMPLE_EDGE]
                                   SHUFFLE [RS_9]
                                     PartitionCols:_col0
-                                    Merge Join Operator [MERGEJOIN_36] (rows=254100 width=1436)
+                                    Merge Join Operator [MERGEJOIN_36] (rows=158402938 width=135)
                                       Conds:RS_4.ws_item_sk=RS_6.i_item_sk(Inner),Output:["_col0","_col3","_col23","_col37","_col38","_col41","_col42","_col47","_col49"]
                                     <-Map 1 [SIMPLE_EDGE]
                                       SHUFFLE [RS_4]
                                         PartitionCols:ws_item_sk
-                                        Filter Operator [FIL_33] (rows=1 width=0)
+                                        Filter Operator [FIL_33] (rows=144002668 width=135)
                                           predicate:(ws_item_sk is not null and ws_sold_date_sk is not null)
-                                          TableScan [TS_0] (rows=1 width=0)
-                                            default@web_sales,web_sales,Tbl:PARTIAL,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"]
+                                          TableScan [TS_0] (rows=144002668 width=135)
+                                            default@web_sales,web_sales,Tbl:COMPLETE,Col:NONE,Output:["ws_sold_date_sk","ws_item_sk","ws_ext_sales_price"]
                                     <-Map 7 [SIMPLE_EDGE]
                                       SHUFFLE [RS_6]
                                         PartitionCols:i_item_sk

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/ql/src/test/results/clientpositive/perf/query13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query13.q.out b/ql/src/test/results/clientpositive/perf/query13.q.out
index bc956e6..c9167e7 100644
--- a/ql/src/test/results/clientpositive/perf/query13.q.out
+++ b/ql/src/test/results/clientpositive/perf/query13.q.out
@@ -109,107 +109,109 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
-Reducer 3 <- Map 9 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 10 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 11 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Map 12 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Reducer 6 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Reducer 8 (SIMPLE_EDGE)
+Reducer 3 <- Reducer 2 (SIMPLE_EDGE)
+Reducer 5 <- Map 4 (SIMPLE_EDGE), Map 9 (SIMPLE_EDGE)
+Reducer 6 <- Map 10 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
+Reducer 7 <- Map 11 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
+Reducer 8 <- Map 12 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:-1
     Stage-1
-      Reducer 7
-      File Output Operator [FS_42]
-        Group By Operator [GBY_40] (rows=1 width=344)
+      Reducer 3
+      File Output Operator [FS_43]
+        Group By Operator [GBY_41] (rows=1 width=344)
           Output:["_col0","_col1","_col2","_col3"],aggregations:["avg(VALUE._col0)","avg(VALUE._col1)","avg(VALUE._col2)","sum(VALUE._col3)"]
-        <-Reducer 6 [SIMPLE_EDGE]
-          SHUFFLE [RS_39]
-            Group By Operator [GBY_38] (rows=1 width=112)
-              Output:["_col0","_col1","_col2","_col3"],aggregations:["avg(_col5)","avg(_col7)","avg(_col8)","sum(_col8)"]
-              Merge Join Operator [MERGEJOIN_73] (rows=9075000 width=1014)
-                Conds:RS_34._col0=RS_35._col0(Inner),Output:["_col5","_col7","_col8"]
-              <-Map 12 [SIMPLE_EDGE]
+        <-Reducer 2 [SIMPLE_EDGE]
+          SHUFFLE [RS_40]
+            Group By Operator [GBY_39] (rows=1 width=112)
+              Output:["_col0","_col1","_col2","_col3"],aggregations:["avg(_col7)","avg(_col9)","avg(_col10)","sum(_col10)"]
+              Merge Join Operator [MERGEJOIN_74] (rows=130450332 width=88)
+                Conds:RS_35._col0=RS_36._col0(Inner),Output:["_col7","_col9","_col10"]
+              <-Map 1 [SIMPLE_EDGE]
                 SHUFFLE [RS_35]
                   PartitionCols:_col0
-                  Select Operator [SEL_33] (rows=36524 width=1119)
+                  Select Operator [SEL_2] (rows=36524 width=1119)
                     Output:["_col0"]
-                    Filter Operator [FIL_68] (rows=36524 width=1119)
+                    Filter Operator [FIL_64] (rows=36524 width=1119)
                       predicate:((d_year = 2001) and d_date_sk is not null)
-                      TableScan [TS_31] (rows=73049 width=1119)
+                      TableScan [TS_0] (rows=73049 width=1119)
                         default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_year"]
-              <-Reducer 5 [SIMPLE_EDGE]
-                SHUFFLE [RS_34]
+              <-Reducer 8 [SIMPLE_EDGE]
+                SHUFFLE [RS_36]
                   PartitionCols:_col0
-                  Select Operator [SEL_30] (rows=8250000 width=1014)
+                  Select Operator [SEL_34] (rows=118591209 width=88)
                     Output:["_col0","_col5","_col7","_col8"]
-                    Filter Operator [FIL_29] (rows=8250000 width=1014)
+                    Filter Operator [FIL_33] (rows=118591209 width=88)
                       predicate:(((_col17) IN ('KY', 'GA', 'NM') and _col9 BETWEEN 100 AND 200) or ((_col17) IN ('MT', 'OR', 'IN') and _col9 BETWEEN 150 AND 300) or ((_col17) IN ('WI', 'MO', 'WV') and _col9 BETWEEN 50 AND 250))
-                      Merge Join Operator [MERGEJOIN_72] (rows=11000000 width=1014)
-                        Conds:RS_26._col3=RS_27._col0(Inner),Output:["_col0","_col5","_col7","_col8","_col9","_col17"]
-                      <-Map 11 [SIMPLE_EDGE]
-                        SHUFFLE [RS_27]
+                      Merge Join Operator [MERGEJOIN_73] (rows=158121612 width=88)
+                        Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col0","_col5","_col7","_col8","_col9","_col17"]
+                      <-Map 12 [SIMPLE_EDGE]
+                        SHUFFLE [RS_31]
                           PartitionCols:_col0
-                          Select Operator [SEL_25] (rows=10000000 width=1014)
+                          Select Operator [SEL_29] (rows=10000000 width=1014)
                             Output:["_col0","_col1"]
-                            Filter Operator [FIL_67] (rows=10000000 width=1014)
+                            Filter Operator [FIL_69] (rows=10000000 width=1014)
                               predicate:((ca_state) IN ('KY', 'GA', 'NM', 'MT', 'OR', 'IN', 'WI', 'MO', 'WV') and (ca_country = 'United States') and ca_address_sk is not null)
-                              TableScan [TS_23] (rows=40000000 width=1014)
+                              TableScan [TS_27] (rows=40000000 width=1014)
                                 default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_country"]
-                      <-Reducer 4 [SIMPLE_EDGE]
-                        SHUFFLE [RS_26]
+                      <-Reducer 7 [SIMPLE_EDGE]
+                        SHUFFLE [RS_30]
                           PartitionCols:_col3
-                          Select Operator [SEL_22] (rows=4491 width=362)
+                          Select Operator [SEL_26] (rows=143746917 width=88)
                             Output:["_col0","_col3","_col5","_col7","_col8","_col9"]
-                            Filter Operator [FIL_21] (rows=4491 width=362)
+                            Filter Operator [FIL_25] (rows=143746917 width=88)
                               predicate:(((_col12 = 'M') and (_col13 = '4 yr Degree') and _col6 BETWEEN 100.0 AND 150.0 and (_col15 = 3)) or ((_col12 = 'D') and (_col13 = 'Primary') and _col6 BETWEEN 50.0 AND 100.0 and (_col15 = 1)) or ((_col12 = 'U') and (_col13 = 'Advanced Degree') and _col6 BETWEEN 150.0 AND 200.0 and (_col15 = 1)))
-                              Merge Join Operator [MERGEJOIN_71] (rows=23958 width=362)
-                                Conds:RS_18._col2=RS_19._col0(Inner),Output:["_col0","_col3","_col5","_col6","_col7","_col8","_col9","_col12","_col13","_col15"]
-                              <-Map 10 [SIMPLE_EDGE]
-                                SHUFFLE [RS_19]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_11] (rows=7200 width=107)
-                                    Output:["_col0","_col1"]
-                                    Filter Operator [FIL_66] (rows=7200 width=107)
-                                      predicate:(((hd_dep_count = 3) or (hd_dep_count = 1)) and hd_demo_sk is not null)
-                                      TableScan [TS_9] (rows=7200 width=107)
-                                        default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_dep_count"]
-                              <-Reducer 3 [SIMPLE_EDGE]
-                                SHUFFLE [RS_18]
-                                  PartitionCols:_col2
-                                  Merge Join Operator [MERGEJOIN_70] (rows=21780 width=362)
-                                    Conds:RS_15._col1=RS_16._col0(Inner),Output:["_col0","_col2","_col3","_col5","_col6","_col7","_col8","_col9","_col12","_col13"]
-                                  <-Map 9 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_16]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_8] (rows=19800 width=362)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_65] (rows=19800 width=362)
-                                          predicate:(((cd_marital_status = 'M') or (cd_marital_status = 'D') or (cd_marital_status = 'U')) and ((cd_education_status = '4 yr Degree') or (cd_education_status = 'Primary') or (cd_education_status = 'Advanced Degree')) and cd_demo_sk is not null)
-                                          TableScan [TS_6] (rows=19800 width=362)
-                                            default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
-                                  <-Reducer 2 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_15]
-                                      PartitionCols:_col1
-                                      Merge Join Operator [MERGEJOIN_69] (rows=1874 width=1911)
-                                        Conds:RS_12._col4=RS_13._col0(Inner),Output:["_col0","_col1","_col2","_col3","_col5","_col6","_col7","_col8","_col9"]
-                                      <-Map 1 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_12]
-                                          PartitionCols:_col4
-                                          Select Operator [SEL_2] (rows=1 width=0)
-                                            Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
-                                            Filter Operator [FIL_63] (rows=1 width=0)
-                                              predicate:((ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 100.0 or ss_sales_price BETWEEN 150.0 AND 200.0) and (ss_net_profit BETWEEN 100 AND 200 or ss_net_profit BETWEEN 150 AND 300 or ss_net_profit BETWEEN 50 AND 250) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null)
-                                              TableScan [TS_0] (rows=1 width=0)
-                                                default@store_sales,store_sales,Tbl:PARTIAL,Col:NONE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_ext_sales_price","ss_ext_wholesale_cost","ss_net_profit"]
-                                      <-Map 8 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_13]
-                                          PartitionCols:_col0
-                                          Select Operator [SEL_5] (rows=1704 width=1910)
-                                            Output:["_col0"]
-                                            Filter Operator [FIL_64] (rows=1704 width=1910)
-                                              predicate:s_store_sk is not null
-                                              TableScan [TS_3] (rows=1704 width=1910)
-                                                default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk"]
+                              Select Operator [SEL_24] (rows=766650239 width=88)
+                                Output:["_col0","_col3","_col5","_col6","_col7","_col8","_col9","_col12","_col13","_col15"]
+                                Merge Join Operator [MERGEJOIN_72] (rows=766650239 width=88)
+                                  Conds:RS_21._col2=RS_22._col0(Inner),Output:["_col1","_col4","_col6","_col7","_col8","_col9","_col10","_col12","_col14","_col15"]
+                                <-Map 11 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_22]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_14] (rows=1583 width=204)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_68] (rows=1583 width=204)
+                                        predicate:(((cd_marital_status = 'M') or (cd_marital_status = 'D') or (cd_marital_status = 'U')) and ((cd_education_status = '4 yr Degree') or (cd_education_status = 'Primary') or (cd_education_status = 'Advanced Degree')) and cd_demo_sk is not null)
+                                        TableScan [TS_12] (rows=1583 width=204)
+                                          default@customer_demographics,customer_demographics,Tbl:COMPLETE,Col:NONE,Output:["cd_demo_sk","cd_marital_status","cd_education_status"]
+                                <-Reducer 6 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_21]
+                                    PartitionCols:_col2
+                                    Merge Join Operator [MERGEJOIN_71] (rows=696954748 width=88)
+                                      Conds:RS_18._col3=RS_19._col0(Inner),Output:["_col1","_col2","_col4","_col6","_col7","_col8","_col9","_col10","_col12"]
+                                    <-Map 10 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_19]
+                                        PartitionCols:_col0
+                                        Select Operator [SEL_11] (rows=7200 width=107)
+                                          Output:["_col0","_col1"]
+                                          Filter Operator [FIL_67] (rows=7200 width=107)
+                                            predicate:(((hd_dep_count = 3) or (hd_dep_count = 1)) and hd_demo_sk is not null)
+                                            TableScan [TS_9] (rows=7200 width=107)
+                                              default@household_demographics,household_demographics,Tbl:COMPLETE,Col:NONE,Output:["hd_demo_sk","hd_dep_count"]
+                                    <-Reducer 5 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_18]
+                                        PartitionCols:_col3
+                                        Merge Join Operator [MERGEJOIN_70] (rows=633595212 width=88)
+                                          Conds:RS_15._col0=RS_16._col4(Inner),Output:["_col1","_col2","_col3","_col4","_col6","_col7","_col8","_col9","_col10"]
+                                        <-Map 4 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_15]
+                                            PartitionCols:_col0
+                                            Select Operator [SEL_5] (rows=1704 width=1910)
+                                              Output:["_col0"]
+                                              Filter Operator [FIL_65] (rows=1704 width=1910)
+                                                predicate:s_store_sk is not null
+                                                TableScan [TS_3] (rows=1704 width=1910)
+                                                  default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk"]
+                                        <-Map 9 [SIMPLE_EDGE]
+                                          SHUFFLE [RS_16]
+                                            PartitionCols:_col4
+                                            Select Operator [SEL_8] (rows=575995635 width=88)
+                                              Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
+                                              Filter Operator [FIL_66] (rows=575995635 width=88)
+                                                predicate:((ss_sales_price BETWEEN 100.0 AND 150.0 or ss_sales_price BETWEEN 50.0 AND 100.0 or ss_sales_price BETWEEN 150.0 AND 200.0) and (ss_net_profit BETWEEN 100 AND 200 or ss_net_profit BETWEEN 150 AND 300 or ss_net_profit BETWEEN 50 AND 250) and ss_store_sk is not null and ss_cdemo_sk is not null and ss_hdemo_sk is not null and ss_addr_sk is not null and ss_sold_date_sk is not null)
+                                                TableScan [TS_6] (rows=575995635 width=88)
+                                                  default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_cdemo_sk","ss_hdemo_sk","ss_addr_sk","ss_store_sk","ss_quantity","ss_sales_price","ss_ext_sales_price","ss_ext_wholesale_cost","ss_net_profit"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/ql/src/test/results/clientpositive/perf/query15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query15.q.out b/ql/src/test/results/clientpositive/perf/query15.q.out
index b537e78..4f4dcc5 100644
--- a/ql/src/test/results/clientpositive/perf/query15.q.out
+++ b/ql/src/test/results/clientpositive/perf/query15.q.out
@@ -17,22 +17,22 @@ Stage-0
     Stage-1
       Reducer 6
       File Output Operator [FS_31]
-        Limit [LIM_30] (rows=100 width=860)
+        Limit [LIM_30] (rows=100 width=135)
           Number of rows:100
-          Select Operator [SEL_29] (rows=53240002 width=860)
+          Select Operator [SEL_29] (rows=174233858 width=135)
             Output:["_col0","_col1"]
           <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_28]
-              Group By Operator [GBY_26] (rows=53240002 width=860)
+              Group By Operator [GBY_26] (rows=174233858 width=135)
                 Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
               <-Reducer 4 [SIMPLE_EDGE]
                 SHUFFLE [RS_25]
                   PartitionCols:_col0
-                  Group By Operator [GBY_24] (rows=106480005 width=860)
+                  Group By Operator [GBY_24] (rows=348467716 width=135)
                     Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col7
-                    Select Operator [SEL_23] (rows=106480005 width=860)
+                    Select Operator [SEL_23] (rows=348467716 width=135)
                       Output:["_col7","_col2"]
-                      Merge Join Operator [MERGEJOIN_47] (rows=106480005 width=860)
+                      Merge Join Operator [MERGEJOIN_47] (rows=348467716 width=135)
                         Conds:RS_20._col0=RS_21._col0(Inner),Output:["_col2","_col7"]
                       <-Map 9 [SIMPLE_EDGE]
                         SHUFFLE [RS_21]
@@ -46,42 +46,42 @@ Stage-0
                       <-Reducer 3 [SIMPLE_EDGE]
                         SHUFFLE [RS_20]
                           PartitionCols:_col0
-                          Select Operator [SEL_16] (rows=96800003 width=860)
+                          Select Operator [SEL_16] (rows=316788826 width=135)
                             Output:["_col0","_col2","_col7"]
-                            Filter Operator [FIL_15] (rows=96800003 width=860)
-                              predicate:((substr(_col7, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792') or (_col6) IN ('CA', 'WA', 'GA') or (_col2 > 500))
-                              Merge Join Operator [MERGEJOIN_46] (rows=96800003 width=860)
-                                Conds:RS_12._col4=RS_13._col0(Inner),Output:["_col0","_col2","_col6","_col7"]
+                            Filter Operator [FIL_15] (rows=316788826 width=135)
+                              predicate:((substr(_col4, 1, 5)) IN ('85669', '86197', '88274', '83405', '86475', '85392', '85460', '80348', '81792') or (_col3) IN ('CA', 'WA', 'GA') or (_col7 > 500))
+                              Merge Join Operator [MERGEJOIN_46] (rows=316788826 width=135)
+                                Conds:RS_12._col0=RS_13._col1(Inner),Output:["_col3","_col4","_col5","_col7"]
                               <-Map 8 [SIMPLE_EDGE]
                                 SHUFFLE [RS_13]
-                                  PartitionCols:_col0
-                                  Select Operator [SEL_8] (rows=40000000 width=1014)
+                                  PartitionCols:_col1
+                                  Select Operator [SEL_8] (rows=287989836 width=135)
                                     Output:["_col0","_col1","_col2"]
-                                    Filter Operator [FIL_43] (rows=40000000 width=1014)
-                                      predicate:ca_address_sk is not null
-                                      TableScan [TS_6] (rows=40000000 width=1014)
-                                        default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_zip"]
+                                    Filter Operator [FIL_43] (rows=287989836 width=135)
+                                      predicate:(cs_bill_customer_sk is not null and cs_sold_date_sk is not null)
+                                      TableScan [TS_6] (rows=287989836 width=135)
+                                        default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_sales_price"]
                               <-Reducer 2 [SIMPLE_EDGE]
                                 SHUFFLE [RS_12]
-                                  PartitionCols:_col4
+                                  PartitionCols:_col0
                                   Merge Join Operator [MERGEJOIN_45] (rows=88000001 width=860)
-                                    Conds:RS_9._col1=RS_10._col0(Inner),Output:["_col0","_col2","_col4"]
+                                    Conds:RS_9._col1=RS_10._col0(Inner),Output:["_col0","_col3","_col4"]
                                   <-Map 1 [SIMPLE_EDGE]
                                     SHUFFLE [RS_9]
                                       PartitionCols:_col1
-                                      Select Operator [SEL_2] (rows=1 width=0)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_41] (rows=1 width=0)
-                                          predicate:(cs_bill_customer_sk is not null and cs_sold_date_sk is not null)
-                                          TableScan [TS_0] (rows=1 width=0)
-                                            default@catalog_sales,catalog_sales,Tbl:PARTIAL,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_sales_price"]
-                                  <-Map 7 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_10]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_5] (rows=80000000 width=860)
+                                      Select Operator [SEL_2] (rows=80000000 width=860)
                                         Output:["_col0","_col1"]
-                                        Filter Operator [FIL_42] (rows=80000000 width=860)
+                                        Filter Operator [FIL_41] (rows=80000000 width=860)
                                           predicate:(c_customer_sk is not null and c_current_addr_sk is not null)
-                                          TableScan [TS_3] (rows=80000000 width=860)
+                                          TableScan [TS_0] (rows=80000000 width=860)
                                             default@customer,customer,Tbl:COMPLETE,Col:NONE,Output:["c_customer_sk","c_current_addr_sk"]
+                                  <-Map 7 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_10]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_5] (rows=40000000 width=1014)
+                                        Output:["_col0","_col1","_col2"]
+                                        Filter Operator [FIL_42] (rows=40000000 width=1014)
+                                          predicate:ca_address_sk is not null
+                                          TableScan [TS_3] (rows=40000000 width=1014)
+                                            default@customer_address,customer_address,Tbl:COMPLETE,Col:NONE,Output:["ca_address_sk","ca_state","ca_zip"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/db8a6db9/ql/src/test/results/clientpositive/perf/query17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query17.q.out b/ql/src/test/results/clientpositive/perf/query17.q.out
index 1b5a640..3692a9a 100644
--- a/ql/src/test/results/clientpositive/perf/query17.q.out
+++ b/ql/src/test/results/clientpositive/perf/query17.q.out
@@ -5,141 +5,143 @@ POSTHOOK: type: QUERY
 Plan optimized by CBO.
 
 Vertex dependency in root stage
-Reducer 10 <- Reducer 9 (SIMPLE_EDGE)
-Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 11 (SIMPLE_EDGE)
-Reducer 3 <- Map 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
-Reducer 4 <- Map 13 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
-Reducer 5 <- Map 14 (SIMPLE_EDGE), Reducer 4 (SIMPLE_EDGE)
-Reducer 6 <- Map 15 (SIMPLE_EDGE), Reducer 5 (SIMPLE_EDGE)
-Reducer 7 <- Map 16 (SIMPLE_EDGE), Reducer 6 (SIMPLE_EDGE)
-Reducer 8 <- Map 17 (SIMPLE_EDGE), Reducer 7 (SIMPLE_EDGE)
-Reducer 9 <- Reducer 8 (SIMPLE_EDGE)
+Reducer 10 <- Map 14 (SIMPLE_EDGE), Reducer 9 (SIMPLE_EDGE)
+Reducer 11 <- Map 15 (SIMPLE_EDGE), Reducer 10 (SIMPLE_EDGE)
+Reducer 12 <- Map 16 (SIMPLE_EDGE), Reducer 11 (SIMPLE_EDGE)
+Reducer 2 <- Map 1 (SIMPLE_EDGE), Map 7 (SIMPLE_EDGE)
+Reducer 3 <- Reducer 12 (SIMPLE_EDGE), Reducer 2 (SIMPLE_EDGE)
+Reducer 4 <- Map 17 (SIMPLE_EDGE), Reducer 3 (SIMPLE_EDGE)
+Reducer 5 <- Reducer 4 (SIMPLE_EDGE)
+Reducer 6 <- Reducer 5 (SIMPLE_EDGE)
+Reducer 9 <- Map 13 (SIMPLE_EDGE), Map 8 (SIMPLE_EDGE)
 
 Stage-0
   Fetch Operator
     limit:100
     Stage-1
-      Reducer 10
+      Reducer 6
       File Output Operator [FS_54]
-        Limit [LIM_53] (rows=100 width=1436)
+        Limit [LIM_53] (rows=100 width=88)
           Number of rows:100
-          Select Operator [SEL_52] (rows=254100 width=1436)
+          Select Operator [SEL_52] (rows=510205767 width=88)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11","_col12","_col13","_col14"]
-          <-Reducer 9 [SIMPLE_EDGE]
+          <-Reducer 5 [SIMPLE_EDGE]
             SHUFFLE [RS_51]
-              Select Operator [SEL_49] (rows=254100 width=1436)
+              Select Operator [SEL_50] (rows=510205767 width=88)
                 Output:["_col0","_col1","_col10","_col11","_col12","_col13","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9"]
-                Group By Operator [GBY_48] (rows=254100 width=1436)
+                Group By Operator [GBY_49] (rows=510205767 width=88)
                   Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["count(VALUE._col0)","avg(VALUE._col1)","stddev_samp(VALUE._col2)","count(VALUE._col3)","avg(VALUE._col4)","stddev_samp(VALUE._col5)","count(VALUE._col6)","avg(VALUE._col7)","stddev_samp(VALUE._col8)"],keys:KEY._col0, KEY._col1, KEY._col2
-                <-Reducer 8 [SIMPLE_EDGE]
-                  SHUFFLE [RS_47]
+                <-Reducer 4 [SIMPLE_EDGE]
+                  SHUFFLE [RS_48]
                     PartitionCols:_col0, _col1, _col2
-                    Group By Operator [GBY_46] (rows=508200 width=1436)
-                      Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["count(_col5)","avg(_col5)","stddev_samp(_col5)","count(_col10)","avg(_col10)","stddev_samp(_col10)","count(_col14)","avg(_col14)","stddev_samp(_col14)"],keys:_col22, _col24, _col25
-                      Select Operator [SEL_45] (rows=508200 width=1436)
-                        Output:["_col22","_col24","_col25","_col5","_col10","_col14"]
-                        Merge Join Operator [MERGEJOIN_104] (rows=508200 width=1436)
-                          Conds:RS_42._col1=RS_43._col0(Inner),Output:["_col5","_col10","_col14","_col22","_col24","_col25"]
+                    Group By Operator [GBY_47] (rows=1020411534 width=88)
+                      Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7","_col8","_col9","_col10","_col11"],aggregations:["count(_col15)","avg(_col15)","stddev_samp(_col15)","count(_col20)","avg(_col20)","stddev_samp(_col20)","count(_col3)","avg(_col3)","stddev_samp(_col3)"],keys:_col24, _col25, _col7
+                      Select Operator [SEL_46] (rows=1020411534 width=88)
+                        Output:["_col24","_col25","_col7","_col15","_col20","_col3"]
+                        Merge Join Operator [MERGEJOIN_100] (rows=1020411534 width=88)
+                          Conds:RS_43._col11=RS_44._col0(Inner),Output:["_col3","_col7","_col15","_col20","_col24","_col25"]
                         <-Map 17 [SIMPLE_EDGE]
-                          SHUFFLE [RS_43]
+                          SHUFFLE [RS_44]
                             PartitionCols:_col0
-                            Select Operator [SEL_23] (rows=462000 width=1436)
+                            Select Operator [SEL_36] (rows=462000 width=1436)
                               Output:["_col0","_col1","_col2"]
-                              Filter Operator [FIL_97] (rows=462000 width=1436)
+                              Filter Operator [FIL_93] (rows=462000 width=1436)
                                 predicate:i_item_sk is not null
-                                TableScan [TS_21] (rows=462000 width=1436)
+                                TableScan [TS_34] (rows=462000 width=1436)
                                   default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id","i_item_desc"]
-                        <-Reducer 7 [SIMPLE_EDGE]
-                          SHUFFLE [RS_42]
-                            PartitionCols:_col1
-                            Merge Join Operator [MERGEJOIN_103] (rows=53473 width=1119)
-                              Conds:RS_39._col3=RS_40._col0(Inner),Output:["_col1","_col5","_col10","_col14","_col22"]
-                            <-Map 16 [SIMPLE_EDGE]
+                        <-Reducer 3 [SIMPLE_EDGE]
+                          SHUFFLE [RS_43]
+                            PartitionCols:_col11
+                            Merge Join Operator [MERGEJOIN_99] (rows=927646829 width=88)
+                              Conds:RS_40._col1, _col2=RS_41._col12, _col11(Inner),Output:["_col3","_col7","_col11","_col15","_col20"]
+                            <-Reducer 12 [SIMPLE_EDGE]
+                              SHUFFLE [RS_41]
+                                PartitionCols:_col12, _col11
+                                Select Operator [SEL_33] (rows=843315281 width=88)
+                                  Output:["_col1","_col11","_col12","_col14","_col5","_col9"]
+                                  Merge Join Operator [MERGEJOIN_98] (rows=843315281 width=88)
+                                    Conds:RS_30._col3=RS_31._col0(Inner),Output:["_col1","_col5","_col7","_col8","_col10","_col16"]
+                                  <-Map 16 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_31]
+                                      PartitionCols:_col0
+                                      Select Operator [SEL_20] (rows=1704 width=1910)
+                                        Output:["_col0","_col1"]
+                                        Filter Operator [FIL_92] (rows=1704 width=1910)
+                                          predicate:s_store_sk is not null
+                                          TableScan [TS_18] (rows=1704 width=1910)
+                                            default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_state"]
+                                  <-Reducer 11 [SIMPLE_EDGE]
+                                    SHUFFLE [RS_30]
+                                      PartitionCols:_col3
+                                      Merge Join Operator [MERGEJOIN_97] (rows=766650239 width=88)
+                                        Conds:RS_27._col6=RS_28._col0(Inner),Output:["_col1","_col3","_col5","_col7","_col8","_col10"]
+                                      <-Map 15 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_28]
+                                          PartitionCols:_col0
+                                          Select Operator [SEL_17] (rows=36525 width=1119)
+                                            Output:["_col0"]
+                                            Filter Operator [FIL_91] (rows=36525 width=1119)
+                                              predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
+                                              TableScan [TS_15] (rows=73049 width=1119)
+                                                default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
+                                      <-Reducer 10 [SIMPLE_EDGE]
+                                        SHUFFLE [RS_27]
+                                          PartitionCols:_col6
+                                          Merge Join Operator [MERGEJOIN_96] (rows=696954748 width=88)
+                                            Conds:RS_24._col0=RS_25._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                          <-Map 14 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_25]
+                                              PartitionCols:_col0
+                                              Select Operator [SEL_14] (rows=36524 width=1119)
+                                                Output:["_col0"]
+                                                Filter Operator [FIL_90] (rows=36524 width=1119)
+                                                  predicate:((d_quarter_name = '2000Q1') and d_date_sk is not null)
+                                                  TableScan [TS_12] (rows=73049 width=1119)
+                                                    default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
+                                          <-Reducer 9 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_24]
+                                              PartitionCols:_col0
+                                              Merge Join Operator [MERGEJOIN_95] (rows=633595212 width=88)
+                                                Conds:RS_21._col2, _col1, _col4=RS_22._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
+                                              <-Map 13 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_22]
+                                                  PartitionCols:_col2, _col1, _col3
+                                                  Select Operator [SEL_11] (rows=57591150 width=77)
+                                                    Output:["_col0","_col1","_col2","_col3","_col4"]
+                                                    Filter Operator [FIL_89] (rows=57591150 width=77)
+                                                      predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
+                                                      TableScan [TS_9] (rows=57591150 width=77)
+                                                        default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]
+                                              <-Map 8 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_21]
+                                                  PartitionCols:_col2, _col1, _col4
+                                                  Select Operator [SEL_8] (rows=575995635 width=88)
+                                                    Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
+                                                    Filter Operator [FIL_88] (rows=575995635 width=88)
+                                                      predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
+                                                      TableScan [TS_6] (rows=575995635 width=88)
+                                                        default@store_sales,store_sales,Tbl:COMPLETE,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"]
+                            <-Reducer 2 [SIMPLE_EDGE]
                               SHUFFLE [RS_40]
-                                PartitionCols:_col0
-                                Select Operator [SEL_20] (rows=1704 width=1910)
-                                  Output:["_col0","_col1"]
-                                  Filter Operator [FIL_96] (rows=1704 width=1910)
-                                    predicate:s_store_sk is not null
-                                    TableScan [TS_18] (rows=1704 width=1910)
-                                      default@store,store,Tbl:COMPLETE,Col:NONE,Output:["s_store_sk","s_state"]
-                            <-Reducer 6 [SIMPLE_EDGE]
-                              SHUFFLE [RS_39]
-                                PartitionCols:_col3
-                                Merge Join Operator [MERGEJOIN_102] (rows=48612 width=1119)
-                                  Conds:RS_36._col11=RS_37._col0(Inner),Output:["_col1","_col3","_col5","_col10","_col14"]
-                                <-Map 15 [SIMPLE_EDGE]
+                                PartitionCols:_col1, _col2
+                                Merge Join Operator [MERGEJOIN_94] (rows=316788826 width=135)
+                                  Conds:RS_37._col0=RS_38._col0(Inner),Output:["_col1","_col2","_col3"]
+                                <-Map 1 [SIMPLE_EDGE]
                                   SHUFFLE [RS_37]
                                     PartitionCols:_col0
-                                    Select Operator [SEL_17] (rows=36525 width=1119)
+                                    Select Operator [SEL_2] (rows=287989836 width=135)
+                                      Output:["_col0","_col1","_col2","_col3"]
+                                      Filter Operator [FIL_86] (rows=287989836 width=135)
+                                        predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
+                                        TableScan [TS_0] (rows=287989836 width=135)
+                                          default@catalog_sales,catalog_sales,Tbl:COMPLETE,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"]
+                                <-Map 7 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_38]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_5] (rows=36525 width=1119)
                                       Output:["_col0"]
-                                      Filter Operator [FIL_95] (rows=36525 width=1119)
+                                      Filter Operator [FIL_87] (rows=36525 width=1119)
                                         predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
-                                        TableScan [TS_15] (rows=73049 width=1119)
+                                        TableScan [TS_3] (rows=73049 width=1119)
                                           default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
-                                <-Reducer 5 [SIMPLE_EDGE]
-                                  SHUFFLE [RS_36]
-                                    PartitionCols:_col11
-                                    Merge Join Operator [MERGEJOIN_101] (rows=44193 width=1119)
-                                      Conds:RS_33._col6=RS_34._col0(Inner),Output:["_col1","_col3","_col5","_col10","_col11","_col14"]
-                                    <-Map 14 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_34]
-                                        PartitionCols:_col0
-                                        Select Operator [SEL_14] (rows=36525 width=1119)
-                                          Output:["_col0"]
-                                          Filter Operator [FIL_94] (rows=36525 width=1119)
-                                            predicate:((d_quarter_name) IN ('2000Q1', '2000Q2', '2000Q3') and d_date_sk is not null)
-                                            TableScan [TS_12] (rows=73049 width=1119)
-                                              default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
-                                    <-Reducer 4 [SIMPLE_EDGE]
-                                      SHUFFLE [RS_33]
-                                        PartitionCols:_col6
-                                        Merge Join Operator [MERGEJOIN_100] (rows=40176 width=1119)
-                                          Conds:RS_30._col0=RS_31._col0(Inner),Output:["_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
-                                        <-Map 13 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_31]
-                                            PartitionCols:_col0
-                                            Select Operator [SEL_11] (rows=36524 width=1119)
-                                              Output:["_col0"]
-                                              Filter Operator [FIL_93] (rows=36524 width=1119)
-                                                predicate:((d_quarter_name = '2000Q1') and d_date_sk is not null)
-                                                TableScan [TS_9] (rows=73049 width=1119)
-                                                  default@date_dim,d1,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_quarter_name"]
-                                        <-Reducer 3 [SIMPLE_EDGE]
-                                          SHUFFLE [RS_30]
-                                            PartitionCols:_col0
-                                            Merge Join Operator [MERGEJOIN_99] (rows=1 width=0)
-                                              Conds:RS_27._col8, _col7=RS_28._col1, _col2(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col10","_col11","_col14"]
-                                            <-Map 12 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_28]
-                                                PartitionCols:_col1, _col2
-                                                Select Operator [SEL_8] (rows=1 width=0)
-                                                  Output:["_col0","_col1","_col2","_col3"]
-                                                  Filter Operator [FIL_92] (rows=1 width=0)
-                                                    predicate:(cs_bill_customer_sk is not null and cs_item_sk is not null and cs_sold_date_sk is not null)
-                                                    TableScan [TS_6] (rows=1 width=0)
-                                                      default@catalog_sales,catalog_sales,Tbl:PARTIAL,Col:NONE,Output:["cs_sold_date_sk","cs_bill_customer_sk","cs_item_sk","cs_quantity"]
-                                            <-Reducer 2 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_27]
-                                                PartitionCols:_col8, _col7
-                                                Merge Join Operator [MERGEJOIN_98] (rows=1 width=0)
-                                                  Conds:RS_24._col2, _col1, _col4=RS_25._col2, _col1, _col3(Inner),Output:["_col0","_col1","_col3","_col5","_col6","_col7","_col8","_col10"]
-                                                <-Map 1 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_24]
-                                                    PartitionCols:_col2, _col1, _col4
-                                                    Select Operator [SEL_2] (rows=1 width=0)
-                                                      Output:["_col0","_col1","_col2","_col3","_col4","_col5"]
-                                                      Filter Operator [FIL_90] (rows=1 width=0)
-                                                        predicate:(ss_item_sk is not null and ss_customer_sk is not null and ss_ticket_number is not null and ss_sold_date_sk is not null and ss_store_sk is not null)
-                                                        TableScan [TS_0] (rows=1 width=0)
-                                                          default@store_sales,store_sales,Tbl:PARTIAL,Col:NONE,Output:["ss_sold_date_sk","ss_item_sk","ss_customer_sk","ss_store_sk","ss_ticket_number","ss_quantity"]
-                                                <-Map 11 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_25]
-                                                    PartitionCols:_col2, _col1, _col3
-                                                    Select Operator [SEL_5] (rows=1 width=0)
-                                                      Output:["_col0","_col1","_col2","_col3","_col4"]
-                                                      Filter Operator [FIL_91] (rows=1 width=0)
-                                                        predicate:(sr_item_sk is not null and sr_customer_sk is not null and sr_ticket_number is not null and sr_returned_date_sk is not null)
-                                                        TableScan [TS_3] (rows=1 width=0)
-                                                          default@store_returns,store_returns,Tbl:PARTIAL,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_customer_sk","sr_ticket_number","sr_return_quantity"]