You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by dj...@apache.org on 2018/05/08 18:42:22 UTC

[17/58] [abbrv] hive git commit: HIVE-18910 : Migrate to Murmur hash for shuffle and bucketing (Deepak Jaiswal, reviewed by Jasone Dere)

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/statsfs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/statsfs.q.out b/ql/src/test/results/clientpositive/spark/statsfs.q.out
index fef2040..1af1495 100644
--- a/ql/src/test/results/clientpositive/spark/statsfs.q.out
+++ b/ql/src/test/results/clientpositive/spark/statsfs.q.out
@@ -274,6 +274,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                
@@ -334,6 +335,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	500                 
 	rawDataSize         	5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/subquery_nested_subquery.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_nested_subquery.q.out b/ql/src/test/results/clientpositive/spark/subquery_nested_subquery.q.out
index 15f33f0..0d894e3 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_nested_subquery.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_nested_subquery.q.out
@@ -11,28 +11,28 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
+121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
+121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
 90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
-85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
+49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
 42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
-105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
+112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
+110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
+155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
 48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
-45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
-65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
-132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
-17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve
 33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
 78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
-121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
-121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
+85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
 17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
-49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
-112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
 40982	almond antique misty red olive	Manufacturer#3	Brand#32	ECONOMY PLATED COPPER	1	LG PKG	1922.98	c foxes can s
 144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
-110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
-155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
+105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
+45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
 146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
+65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
+132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
+17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
index 51b2b44..83849d1 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_notin.q.out
@@ -1188,25 +1188,25 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1	almond aquamarine burnished black steel	28
-Manufacturer#1	almond antique chartreuse lavender yellow	34
 Manufacturer#1	almond aquamarine pink moccasin thistle	42
-Manufacturer#2	almond aquamarine rose maroon antique	25
+Manufacturer#2	almond antique violet chocolate turquoise	14
+Manufacturer#2	almond aquamarine sandy cyan gainsboro	18
 Manufacturer#2	almond antique violet turquoise frosted	40
-Manufacturer#3	almond antique chartreuse khaki white	17
 Manufacturer#3	almond antique metallic orange dim	19
+Manufacturer#4	almond aquamarine floral ivory bisque	27
+Manufacturer#4	almond antique violet mint lemon	39
 Manufacturer#5	almond antique medium spring khaki	6
 Manufacturer#5	almond azure blanched chiffon midnight	23
 Manufacturer#5	almond antique blue firebrick mint	31
 Manufacturer#5	almond aquamarine dodger light gainsboro	46
 Manufacturer#1	almond antique salmon chartreuse burlywood	6
-Manufacturer#2	almond antique violet chocolate turquoise	14
-Manufacturer#2	almond aquamarine sandy cyan gainsboro	18
+Manufacturer#1	almond antique chartreuse lavender yellow	34
+Manufacturer#2	almond aquamarine rose maroon antique	25
 Manufacturer#3	almond antique forest lavender goldenrod	14
+Manufacturer#3	almond antique chartreuse khaki white	17
 Manufacturer#3	almond antique olive coral navajo	45
 Manufacturer#4	almond antique gainsboro frosted violet	10
 Manufacturer#4	almond azure aquamarine papaya violet	12
-Manufacturer#4	almond aquamarine floral ivory bisque	27
-Manufacturer#4	almond antique violet mint lemon	39
 Warning: Shuffle Join JOIN[19][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: select li.l_partkey, count(*)
 from lineitem li
@@ -1225,21 +1225,21 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@lineitem
 #### A masked pattern was here ####
 22630	1
-7068	1
-88362	1
-123076	1
-139636	1
-106170	1
-182052	1
-59694	1
 175839	1
-21636	1
 119767	1
+139636	1
+21636	1
 119477	1
-88035	1
-450	1
-61931	1
+88362	1
+106170	1
+59694	1
+7068	1
+123076	1
 85951	1
+61931	1
+450	1
+182052	1
+88035	1
 Warning: Shuffle Join JOIN[18][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: select * 
 from src 
@@ -1755,29 +1755,29 @@ POSTHOOK: query: select * from part where p_brand <> 'Brand#14' AND p_size NOT I
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
-78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
+85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
+65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
 105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
 112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
 146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
-90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
 110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
+48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
-33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
+45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
 42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
+195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
+144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
+17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve
 15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
-85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
-65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
+78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
+90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
-48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
-45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
 132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
-195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
-144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
+33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
 Warning: Shuffle Join JOIN[26][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from part  where (p_size-1) NOT IN (select min(p_size) from part group by p_type) order by p_partkey
 PREHOOK: type: QUERY
@@ -2173,27 +2173,27 @@ POSTHOOK: Input: default@part
 17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve
 121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
 121152	almond antique burnished rose metallic	Manufacturer#1	Brand#14	PROMO PLATED TIN	2	JUMBO BOX	1173.15	e pinto beans h
+42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
+146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
+15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
+78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
+112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
+132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
+191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
+17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
 155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
+33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
 49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
-15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
+110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
 45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
+105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
 90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
-112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
+48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
 65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
 85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
-191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
-17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
-42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
-146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
-33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
-110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
-105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
-78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
-48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
-132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
 144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
 PREHOOK: query: explain select count(*) as c from part as e where p_size + 100 NOT IN (select p_partkey from part where p_name = e.p_name)
 PREHOOK: type: QUERY
@@ -2845,27 +2845,27 @@ POSTHOOK: Input: default@part
 192697	almond antique blue firebrick mint	Manufacturer#5	Brand#52	MEDIUM BURNISHED TIN	31	LG DRUM	1789.69	ickly ir
 90681	almond antique chartreuse khaki white	Manufacturer#3	Brand#31	MEDIUM BURNISHED TIN	17	SM CASE	1671.68	are slyly after the sl
 85768	almond antique chartreuse lavender yellow	Manufacturer#1	Brand#12	LARGE BRUSHED STEEL	34	SM BAG	1753.76	refull
-112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
+17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
+40982	almond antique misty red olive	Manufacturer#3	Brand#32	ECONOMY PLATED COPPER	1	LG PKG	1922.98	c foxes can s
+144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
 110592	almond antique salmon chartreuse burlywood	Manufacturer#1	Brand#15	PROMO BURNISHED NICKEL	6	JUMBO PKG	1602.59	 to the furiously
-15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
-45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
+155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
+146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
 132666	almond aquamarine rose maroon antique	Manufacturer#2	Brand#24	SMALL POLISHED NICKEL	25	MED BOX	1698.66	even 
 195606	almond aquamarine sandy cyan gainsboro	Manufacturer#2	Brand#25	STANDARD PLATED TIN	18	SM PKG	1701.6	ic de
-33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
 78486	almond azure blanched chiffon midnight	Manufacturer#5	Brand#52	LARGE BRUSHED BRASS	23	MED BAG	1464.48	hely blith
-17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
 49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
 42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
-40982	almond antique misty red olive	Manufacturer#3	Brand#32	ECONOMY PLATED COPPER	1	LG PKG	1922.98	c foxes can s
-144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
-155733	almond antique sky peru orange	Manufacturer#5	Brand#53	SMALL PLATED BRASS	2	WRAP DRUM	1788.73	furiously. bra
+112398	almond antique metallic orange dim	Manufacturer#3	Brand#32	MEDIUM BURNISHED BRASS	19	JUMBO JAR	1410.39	ole car
 105685	almond antique violet chocolate turquoise	Manufacturer#2	Brand#22	MEDIUM ANODIZED COPPER	14	MED CAN	1690.68	ly pending requ
 48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 191709	almond antique violet turquoise frosted	Manufacturer#2	Brand#22	ECONOMY POLISHED STEEL	40	MED BOX	1800.7	 haggle
 86428	almond aquamarine burnished black steel	Manufacturer#1	Brand#12	STANDARD ANODIZED STEEL	28	WRAP BAG	1414.42	arefully 
-146985	almond aquamarine midnight light salmon	Manufacturer#2	Brand#23	MEDIUM BURNISHED COPPER	2	SM CASE	2031.98	s cajole caref
+15103	almond aquamarine dodger light gainsboro	Manufacturer#5	Brand#53	ECONOMY BURNISHED STEEL	46	LG PACK	1018.1	packages hinder carefu
+45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
 65667	almond aquamarine pink moccasin thistle	Manufacturer#1	Brand#12	LARGE BURNISHED STEEL	42	JUMBO CASE	1632.66	e across the expr
 17927	almond aquamarine yellow dodger mint	Manufacturer#4	Brand#41	ECONOMY BRUSHED COPPER	7	SM PKG	1844.92	ites. eve
+33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
 PREHOOK: query: explain select * from part where p_name NOT IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from part where p_name NOT IN (select p_name from part p where p.p_size = part.p_size AND part.p_partkey= p.p_partkey )
@@ -3442,29 +3442,29 @@ POSTHOOK: Input: default@part
 almond aquamarine yellow dodger mint
 almond aquamarine dodger light gainsboro
 almond antique violet turquoise frosted
-almond aquamarine pink moccasin thistle
+almond antique chartreuse lavender yellow
+almond antique metallic orange dim
+almond antique blue firebrick mint
 almond antique salmon chartreuse burlywood
 almond antique burnished rose metallic
 almond antique burnished rose metallic
-almond antique gainsboro frosted violet
+almond antique sky peru orange
+almond aquamarine floral ivory bisque
+almond aquamarine rose maroon antique
+almond aquamarine burnished black steel
 almond azure aquamarine papaya violet
-almond aquamarine sandy cyan gainsboro
+almond antique medium spring khaki
 almond antique olive coral navajo
 almond antique misty red olive
 almond azure blanched chiffon midnight
-almond antique chartreuse lavender yellow
+almond aquamarine pink moccasin thistle
 almond antique violet chocolate turquoise
-almond antique metallic orange dim
 almond aquamarine midnight light salmon
 almond antique chartreuse khaki white
-almond antique blue firebrick mint
 almond antique forest lavender goldenrod
 almond antique violet mint lemon
-almond antique sky peru orange
-almond aquamarine floral ivory bisque
-almond aquamarine rose maroon antique
-almond aquamarine burnished black steel
-almond antique medium spring khaki
+almond antique gainsboro frosted violet
+almond aquamarine sandy cyan gainsboro
 Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain select key, count(*) from src where value NOT IN (select key from src) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key )
 PREHOOK: type: QUERY
@@ -3711,37 +3711,37 @@ POSTHOOK: query: select key, count(*) from src where value NOT IN (select key fr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-273	3
-454	3
-311	3
-128	3
-396	3
-316	3
+70	3
+431	3
+90	3
 384	3
-369	3
+466	3
+5	3
+409	3
+318	3
 417	3
+167	3
+128	3
+327	3
+193	3
+438	3
+403	3
 298	3
-208	3
-199	3
 430	3
 187	3
-193	3
-318	3
-327	3
-5	3
+273	3
+454	3
 119	3
-466	3
-70	3
-167	3
-403	3
-480	3
+316	3
+311	3
 0	3
-409	3
-35	3
-90	3
-438	3
-431	3
+369	3
 498	3
+35	3
+480	3
+208	3
+199	3
+396	3
 PREHOOK: query: explain select key, count(*) from src where value NOT IN (select concat('v', value) from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key )
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select key, count(*) from src where value NOT IN (select concat('v', value) from src sc where sc.key = src.key ) group by key having count(*) in (select count(*) from src s1 where s1.key = '90' group by s1.key )
@@ -4007,37 +4007,37 @@ POSTHOOK: query: select key, count(*) from src where value NOT IN (select concat
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-273	3
-454	3
-311	3
-128	3
-396	3
-316	3
+70	3
+431	3
+90	3
 384	3
-369	3
+466	3
+5	3
+409	3
+318	3
 417	3
+167	3
+128	3
+327	3
+193	3
+438	3
+403	3
 298	3
-208	3
-199	3
 430	3
 187	3
-193	3
-318	3
-327	3
-5	3
+273	3
+454	3
 119	3
-466	3
-70	3
-167	3
-403	3
-480	3
+316	3
+311	3
 0	3
-409	3
-35	3
-90	3
-438	3
-431	3
+369	3
 498	3
+35	3
+480	3
+208	3
+199	3
+396	3
 Warning: Shuffle Join JOIN[26][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain select * from part  where (p_size-1) NOT IN (select min(p_size) from part group by p_type) order by p_brand
 PREHOOK: type: QUERY
@@ -4241,8 +4241,8 @@ POSTHOOK: Input: default@part
 40982	almond antique misty red olive	Manufacturer#3	Brand#32	ECONOMY PLATED COPPER	1	LG PKG	1922.98	c foxes can s
 144293	almond antique olive coral navajo	Manufacturer#3	Brand#34	STANDARD POLISHED STEEL	45	JUMBO CAN	1337.29	ag furiously about 
 17273	almond antique forest lavender goldenrod	Manufacturer#3	Brand#35	PROMO ANODIZED TIN	14	JUMBO CASE	1190.27	along the
-49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
 33357	almond azure aquamarine papaya violet	Manufacturer#4	Brand#41	STANDARD ANODIZED TIN	12	WRAP CASE	1290.35	reful
+49671	almond antique gainsboro frosted violet	Manufacturer#4	Brand#41	SMALL BRUSHED BRASS	10	SM BOX	1620.67	ccounts run quick
 45261	almond aquamarine floral ivory bisque	Manufacturer#4	Brand#42	SMALL PLATED STEEL	27	WRAP CASE	1206.26	careful
 48427	almond antique violet mint lemon	Manufacturer#4	Brand#42	PROMO POLISHED STEEL	39	SM CASE	1375.42	hely ironic i
 42669	almond antique medium spring khaki	Manufacturer#5	Brand#51	STANDARD BURNISHED TIN	6	MED CAN	1611.66	sits haggl
@@ -4649,9 +4649,11 @@ POSTHOOK: Input: default@src
 103	val_103
 104	val_104
 104	val_104
+105	val_105
+11	val_11
 111	val_111
-114	val_114
-116	val_116
+12	val_12
+12	val_12
 120	val_120
 120	val_120
 126	val_126
@@ -4664,73 +4666,59 @@ POSTHOOK: Input: default@src
 133	val_133
 134	val_134
 134	val_134
-145	val_145
-146	val_146
-146	val_146
+136	val_136
+143	val_143
 149	val_149
 149	val_149
-15	val_15
-15	val_15
+150	val_150
 152	val_152
 152	val_152
-155	val_155
+153	val_153
+156	val_156
 157	val_157
+160	val_160
+162	val_162
+163	val_163
+166	val_166
+167	val_167
+167	val_167
+167	val_167
+168	val_168
 169	val_169
 169	val_169
 169	val_169
 169	val_169
 17	val_17
 170	val_170
-172	val_172
-172	val_172
-178	val_178
-179	val_179
-179	val_179
-181	val_181
-187	val_187
-187	val_187
-187	val_187
-189	val_189
-19	val_19
-191	val_191
-191	val_191
-192	val_192
-194	val_194
-195	val_195
-195	val_195
-199	val_199
-199	val_199
-199	val_199
-2	val_2
+174	val_174
+174	val_174
+175	val_175
+175	val_175
+176	val_176
+176	val_176
+180	val_180
+193	val_193
+193	val_193
+193	val_193
+196	val_196
 20	val_20
-200	val_200
-200	val_200
 201	val_201
-202	val_202
 203	val_203
 203	val_203
-207	val_207
-207	val_207
-208	val_208
-208	val_208
-208	val_208
+205	val_205
+205	val_205
+209	val_209
+209	val_209
 213	val_213
 213	val_213
-214	val_214
-216	val_216
-216	val_216
 218	val_218
-222	val_222
+221	val_221
+221	val_221
 223	val_223
 223	val_223
-224	val_224
-224	val_224
-228	val_228
-229	val_229
-229	val_229
+226	val_226
 233	val_233
 233	val_233
-235	val_235
 237	val_237
 237	val_237
 239	val_239
@@ -4738,408 +4726,420 @@ POSTHOOK: Input: default@src
 24	val_24
 24	val_24
 241	val_241
-244	val_244
+242	val_242
+242	val_242
+247	val_247
+248	val_248
 255	val_255
 255	val_255
 256	val_256
 256	val_256
-257	val_257
-258	val_258
 26	val_26
 26	val_26
-262	val_262
-265	val_265
-265	val_265
-266	val_266
-27	val_27
-273	val_273
-273	val_273
-273	val_273
+263	val_263
+272	val_272
+272	val_272
+274	val_274
 275	val_275
-278	val_278
-278	val_278
-28	val_28
-280	val_280
-280	val_280
+277	val_277
+277	val_277
+277	val_277
+277	val_277
+281	val_281
+281	val_281
 282	val_282
 282	val_282
-284	val_284
 285	val_285
 286	val_286
 287	val_287
-288	val_288
-288	val_288
-291	val_291
+289	val_289
 292	val_292
+296	val_296
 298	val_298
 298	val_298
 298	val_298
-30	val_30
 302	val_302
-305	val_305
+307	val_307
+307	val_307
+308	val_308
+309	val_309
+309	val_309
 310	val_310
-311	val_311
-311	val_311
-311	val_311
-316	val_316
-316	val_316
-316	val_316
-321	val_321
-321	val_321
+318	val_318
+318	val_318
+318	val_318
 323	val_323
-33	val_33
+325	val_325
+325	val_325
+327	val_327
+327	val_327
+327	val_327
 332	val_332
 333	val_333
 333	val_333
 335	val_335
-336	val_336
 338	val_338
 339	val_339
-344	val_344
-344	val_344
-353	val_353
-353	val_353
+34	val_34
+341	val_341
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+348	val_348
 356	val_356
 360	val_360
 362	val_362
-364	val_364
-368	val_368
-369	val_369
-369	val_369
-369	val_369
+367	val_367
+367	val_367
 37	val_37
 37	val_37
-373	val_373
+374	val_374
+375	val_375
 377	val_377
-378	val_378
+379	val_379
+382	val_382
+382	val_382
 384	val_384
 384	val_384
 384	val_384
-386	val_386
 392	val_392
-395	val_395
-395	val_395
-396	val_396
-396	val_396
-396	val_396
-397	val_397
-397	val_397
+399	val_399
+399	val_399
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+401	val_401
 402	val_402
-404	val_404
-404	val_404
-407	val_407
-411	val_411
+403	val_403
+403	val_403
+403	val_403
+409	val_409
+409	val_409
+409	val_409
+413	val_413
+413	val_413
 417	val_417
 417	val_417
 417	val_417
-418	val_418
 419	val_419
 42	val_42
 42	val_42
-424	val_424
-424	val_424
+427	val_427
+429	val_429
+429	val_429
 43	val_43
 430	val_430
 430	val_430
 430	val_430
+431	val_431
+431	val_431
+431	val_431
 432	val_432
-436	val_436
+435	val_435
 437	val_437
-444	val_444
-448	val_448
-449	val_449
-453	val_453
-454	val_454
-454	val_454
-454	val_454
+438	val_438
+438	val_438
+438	val_438
+439	val_439
+439	val_439
+44	val_44
+443	val_443
 457	val_457
+458	val_458
+458	val_458
 459	val_459
 459	val_459
-468	val_468
-468	val_468
-468	val_468
-468	val_468
-47	val_47
-477	val_477
+462	val_462
+462	val_462
+466	val_466
+466	val_466
+466	val_466
+467	val_467
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+470	val_470
+472	val_472
+475	val_475
+478	val_478
+478	val_478
 479	val_479
 481	val_481
-482	val_482
 483	val_483
-485	val_485
+487	val_487
 489	val_489
 489	val_489
 489	val_489
 489	val_489
-490	val_490
-492	val_492
-492	val_492
-493	val_493
 494	val_494
 495	val_495
 496	val_496
-497	val_497
+5	val_5
+5	val_5
+5	val_5
+51	val_51
+51	val_51
 57	val_57
-65	val_65
-67	val_67
-67	val_67
+58	val_58
+58	val_58
+64	val_64
+66	val_66
+69	val_69
+70	val_70
+70	val_70
+70	val_70
 72	val_72
 72	val_72
 74	val_74
 76	val_76
 76	val_76
-8	val_8
-80	val_80
+77	val_77
 82	val_82
-85	val_85
-86	val_86
-87	val_87
+83	val_83
+83	val_83
+84	val_84
+84	val_84
 9	val_9
-92	val_92
-96	val_96
-97	val_97
-97	val_97
+90	val_90
+90	val_90
+90	val_90
 0	val_0
 0	val_0
 0	val_0
-105	val_105
-11	val_11
 113	val_113
 113	val_113
+114	val_114
+116	val_116
 118	val_118
 118	val_118
 119	val_119
 119	val_119
 119	val_119
-12	val_12
-12	val_12
 125	val_125
 125	val_125
-136	val_136
 137	val_137
 137	val_137
 138	val_138
 138	val_138
 138	val_138
 138	val_138
-143	val_143
-150	val_150
-153	val_153
-156	val_156
-158	val_158
-160	val_160
-162	val_162
-163	val_163
+145	val_145
+146	val_146
+146	val_146
+15	val_15
+15	val_15
+155	val_155
+158	val_158
 164	val_164
 164	val_164
 165	val_165
 165	val_165
-166	val_166
-167	val_167
-167	val_167
-167	val_167
-168	val_168
-174	val_174
-174	val_174
-175	val_175
-175	val_175
-176	val_176
-176	val_176
+172	val_172
+172	val_172
 177	val_177
+178	val_178
+179	val_179
+179	val_179
 18	val_18
 18	val_18
-180	val_180
+181	val_181
 183	val_183
 186	val_186
+187	val_187
+187	val_187
+187	val_187
+189	val_189
+19	val_19
 190	val_190
-193	val_193
-193	val_193
-193	val_193
-196	val_196
+191	val_191
+191	val_191
+192	val_192
+194	val_194
+195	val_195
+195	val_195
 197	val_197
 197	val_197
-205	val_205
-205	val_205
-209	val_209
-209	val_209
+199	val_199
+199	val_199
+199	val_199
+2	val_2
+200	val_200
+200	val_200
+202	val_202
+207	val_207
+207	val_207
+208	val_208
+208	val_208
+208	val_208
+214	val_214
+216	val_216
+216	val_216
 217	val_217
 217	val_217
 219	val_219
 219	val_219
-221	val_221
-221	val_221
-226	val_226
+222	val_222
+224	val_224
+224	val_224
+228	val_228
+229	val_229
+229	val_229
 230	val_230
 230	val_230
 230	val_230
 230	val_230
 230	val_230
+235	val_235
 238	val_238
 238	val_238
-242	val_242
-242	val_242
-247	val_247
-248	val_248
+244	val_244
 249	val_249
 252	val_252
+257	val_257
+258	val_258
 260	val_260
-263	val_263
-272	val_272
-272	val_272
-274	val_274
-277	val_277
-277	val_277
-277	val_277
-277	val_277
-281	val_281
-281	val_281
+262	val_262
+265	val_265
+265	val_265
+266	val_266
+27	val_27
+273	val_273
+273	val_273
+273	val_273
+278	val_278
+278	val_278
+28	val_28
+280	val_280
+280	val_280
 283	val_283
-289	val_289
-296	val_296
+284	val_284
+288	val_288
+288	val_288
+291	val_291
+30	val_30
+305	val_305
 306	val_306
-307	val_307
-307	val_307
-308	val_308
-309	val_309
-309	val_309
+311	val_311
+311	val_311
+311	val_311
 315	val_315
+316	val_316
+316	val_316
+316	val_316
 317	val_317
 317	val_317
-318	val_318
-318	val_318
-318	val_318
+321	val_321
+321	val_321
 322	val_322
 322	val_322
-325	val_325
-325	val_325
-327	val_327
-327	val_327
-327	val_327
+33	val_33
 331	val_331
 331	val_331
-34	val_34
-341	val_341
+336	val_336
 342	val_342
 342	val_342
+344	val_344
+344	val_344
 345	val_345
-348	val_348
-348	val_348
-348	val_348
-348	val_348
-348	val_348
 35	val_35
 35	val_35
 35	val_35
 351	val_351
+353	val_353
+353	val_353
+364	val_364
 365	val_365
 366	val_366
-367	val_367
-367	val_367
-374	val_374
-375	val_375
-379	val_379
-382	val_382
-382	val_382
+368	val_368
+369	val_369
+369	val_369
+369	val_369
+373	val_373
+378	val_378
+386	val_386
 389	val_389
 393	val_393
 394	val_394
-399	val_399
-399	val_399
+395	val_395
+395	val_395
+396	val_396
+396	val_396
+396	val_396
+397	val_397
+397	val_397
 4	val_4
 400	val_400
-401	val_401
-401	val_401
-401	val_401
-401	val_401
-401	val_401
-403	val_403
-403	val_403
-403	val_403
+404	val_404
+404	val_404
 406	val_406
 406	val_406
 406	val_406
 406	val_406
-409	val_409
-409	val_409
-409	val_409
+407	val_407
 41	val_41
-413	val_413
-413	val_413
+411	val_411
 414	val_414
 414	val_414
+418	val_418
 421	val_421
-427	val_427
-429	val_429
-429	val_429
-431	val_431
-431	val_431
-431	val_431
-435	val_435
-438	val_438
-438	val_438
-438	val_438
-439	val_439
-439	val_439
-44	val_44
-443	val_443
+424	val_424
+424	val_424
+436	val_436
+444	val_444
 446	val_446
+448	val_448
+449	val_449
 452	val_452
+453	val_453
+454	val_454
+454	val_454
+454	val_454
 455	val_455
-458	val_458
-458	val_458
 460	val_460
-462	val_462
-462	val_462
 463	val_463
 463	val_463
-466	val_466
-466	val_466
-466	val_466
-467	val_467
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-470	val_470
-472	val_472
-475	val_475
-478	val_478
-478	val_478
+468	val_468
+468	val_468
+468	val_468
+468	val_468
+47	val_47
+477	val_477
 480	val_480
 480	val_480
 480	val_480
+482	val_482
 484	val_484
-487	val_487
+485	val_485
+490	val_490
 491	val_491
+492	val_492
+492	val_492
+493	val_493
+497	val_497
 498	val_498
 498	val_498
 498	val_498
-5	val_5
-5	val_5
-5	val_5
-51	val_51
-51	val_51
 53	val_53
 54	val_54
-58	val_58
-58	val_58
-64	val_64
-66	val_66
-69	val_69
-70	val_70
-70	val_70
-70	val_70
-77	val_77
-78	val_78
-83	val_83
-83	val_83
-84	val_84
-84	val_84
-90	val_90
-90	val_90
-90	val_90
+65	val_65
+67	val_67
+67	val_67
+78	val_78
+8	val_8
+80	val_80
+85	val_85
+86	val_86
+87	val_87
+92	val_92
 95	val_95
 95	val_95
+96	val_96
+97	val_97
+97	val_97
 98	val_98
 98	val_98
 PREHOOK: query: explain select count(*) as c from part as e where p_size + 100 not in ( select p_type from part where p_brand = e.p_brand)
@@ -5800,8 +5800,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t1
 POSTHOOK: Input: default@t2
 #### A masked pattern was here ####
-NULL
 1
+NULL
 PREHOOK: query: DROP TABLE t1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@t1
@@ -6491,9 +6491,9 @@ POSTHOOK: query: select t.i from t where t.j NOT IN (select t1.i from t t1 where
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t
 #### A masked pattern was here ####
-4
 7
 1
+4
 PREHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from t t1 where t1.j=t.j)
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from t t1 where t1.j=t.j)
@@ -6808,8 +6808,8 @@ POSTHOOK: query: select t.i from t where t.j NOT IN (select t1.i from t t1 )
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@t
 #### A masked pattern was here ####
-4
 1
+4
 Warning: Shuffle Join JOIN[16][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain select t.i from t where t.i NOT IN (select t1.i from t t1 )
 PREHOOK: type: QUERY
@@ -7218,9 +7218,11 @@ POSTHOOK: Input: default@src
 103	val_103
 104	val_104
 104	val_104
+105	val_105
+11	val_11
 111	val_111
-114	val_114
-116	val_116
+12	val_12
+12	val_12
 120	val_120
 120	val_120
 126	val_126
@@ -7233,73 +7235,59 @@ POSTHOOK: Input: default@src
 133	val_133
 134	val_134
 134	val_134
-145	val_145
-146	val_146
-146	val_146
+136	val_136
+143	val_143
 149	val_149
 149	val_149
-15	val_15
-15	val_15
+150	val_150
 152	val_152
 152	val_152
-155	val_155
+153	val_153
+156	val_156
 157	val_157
+160	val_160
+162	val_162
+163	val_163
+166	val_166
+167	val_167
+167	val_167
+167	val_167
+168	val_168
 169	val_169
 169	val_169
 169	val_169
 169	val_169
 17	val_17
 170	val_170
-172	val_172
-172	val_172
-178	val_178
-179	val_179
-179	val_179
-181	val_181
-187	val_187
-187	val_187
-187	val_187
-189	val_189
-19	val_19
-191	val_191
-191	val_191
-192	val_192
-194	val_194
-195	val_195
-195	val_195
-199	val_199
-199	val_199
-199	val_199
-2	val_2
+174	val_174
+174	val_174
+175	val_175
+175	val_175
+176	val_176
+176	val_176
+180	val_180
+193	val_193
+193	val_193
+193	val_193
+196	val_196
 20	val_20
-200	val_200
-200	val_200
 201	val_201
-202	val_202
 203	val_203
 203	val_203
-207	val_207
-207	val_207
-208	val_208
-208	val_208
-208	val_208
+205	val_205
+205	val_205
+209	val_209
+209	val_209
 213	val_213
 213	val_213
-214	val_214
-216	val_216
-216	val_216
 218	val_218
-222	val_222
+221	val_221
+221	val_221
 223	val_223
 223	val_223
-224	val_224
-224	val_224
-228	val_228
-229	val_229
-229	val_229
+226	val_226
 233	val_233
 233	val_233
-235	val_235
 237	val_237
 237	val_237
 239	val_239
@@ -7307,407 +7295,419 @@ POSTHOOK: Input: default@src
 24	val_24
 24	val_24
 241	val_241
-244	val_244
+242	val_242
+242	val_242
+247	val_247
+248	val_248
 255	val_255
 255	val_255
 256	val_256
 256	val_256
-257	val_257
-258	val_258
 26	val_26
 26	val_26
-262	val_262
-265	val_265
-265	val_265
-266	val_266
-27	val_27
-273	val_273
-273	val_273
-273	val_273
+263	val_263
+272	val_272
+272	val_272
+274	val_274
 275	val_275
-278	val_278
-278	val_278
-28	val_28
-280	val_280
-280	val_280
+277	val_277
+277	val_277
+277	val_277
+277	val_277
+281	val_281
+281	val_281
 282	val_282
 282	val_282
-284	val_284
 285	val_285
 286	val_286
 287	val_287
-288	val_288
-288	val_288
-291	val_291
+289	val_289
 292	val_292
+296	val_296
 298	val_298
 298	val_298
 298	val_298
-30	val_30
 302	val_302
-305	val_305
+307	val_307
+307	val_307
+308	val_308
+309	val_309
+309	val_309
 310	val_310
-311	val_311
-311	val_311
-311	val_311
-316	val_316
-316	val_316
-316	val_316
-321	val_321
-321	val_321
+318	val_318
+318	val_318
+318	val_318
 323	val_323
-33	val_33
+325	val_325
+325	val_325
+327	val_327
+327	val_327
+327	val_327
 332	val_332
 333	val_333
 333	val_333
 335	val_335
-336	val_336
 338	val_338
 339	val_339
-344	val_344
-344	val_344
-353	val_353
-353	val_353
+34	val_34
+341	val_341
+348	val_348
+348	val_348
+348	val_348
+348	val_348
+348	val_348
 356	val_356
 360	val_360
 362	val_362
-364	val_364
-368	val_368
-369	val_369
-369	val_369
-369	val_369
+367	val_367
+367	val_367
 37	val_37
 37	val_37
-373	val_373
+374	val_374
+375	val_375
 377	val_377
-378	val_378
+379	val_379
+382	val_382
+382	val_382
 384	val_384
 384	val_384
 384	val_384
-386	val_386
 392	val_392
-395	val_395
-395	val_395
-396	val_396
-396	val_396
-396	val_396
-397	val_397
-397	val_397
+399	val_399
+399	val_399
+401	val_401
+401	val_401
+401	val_401
+401	val_401
+401	val_401
 402	val_402
-404	val_404
-404	val_404
-407	val_407
-411	val_411
+403	val_403
+403	val_403
+403	val_403
+409	val_409
+409	val_409
+409	val_409
+413	val_413
+413	val_413
 417	val_417
 417	val_417
 417	val_417
-418	val_418
 419	val_419
 42	val_42
 42	val_42
-424	val_424
-424	val_424
+427	val_427
+429	val_429
+429	val_429
 43	val_43
 430	val_430
 430	val_430
 430	val_430
+431	val_431
+431	val_431
+431	val_431
 432	val_432
-436	val_436
+435	val_435
 437	val_437
-444	val_444
-448	val_448
-449	val_449
-453	val_453
-454	val_454
-454	val_454
-454	val_454
+438	val_438
+438	val_438
+438	val_438
+439	val_439
+439	val_439
+44	val_44
+443	val_443
 457	val_457
+458	val_458
+458	val_458
 459	val_459
 459	val_459
-468	val_468
-468	val_468
-468	val_468
-468	val_468
-47	val_47
-477	val_477
-479	val_479
-481	val_481
-482	val_482
+462	val_462
+462	val_462
+466	val_466
+466	val_466
+466	val_466
+467	val_467
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+469	val_469
+470	val_470
+472	val_472
+475	val_475
+478	val_478
+478	val_478
+479	val_479
+481	val_481
 483	val_483
-485	val_485
+487	val_487
 489	val_489
 489	val_489
 489	val_489
 489	val_489
-490	val_490
-492	val_492
-492	val_492
-493	val_493
 494	val_494
 495	val_495
 496	val_496
-497	val_497
+5	val_5
+5	val_5
+5	val_5
+51	val_51
+51	val_51
 57	val_57
-65	val_65
-67	val_67
-67	val_67
+58	val_58
+58	val_58
+64	val_64
+66	val_66
+69	val_69
+70	val_70
+70	val_70
+70	val_70
 72	val_72
 72	val_72
 74	val_74
 76	val_76
 76	val_76
-8	val_8
-80	val_80
+77	val_77
 82	val_82
-85	val_85
-86	val_86
-87	val_87
+83	val_83
+83	val_83
+84	val_84
+84	val_84
 9	val_9
-92	val_92
-96	val_96
-97	val_97
-97	val_97
+90	val_90
+90	val_90
+90	val_90
 0	val_0
 0	val_0
 0	val_0
-105	val_105
-11	val_11
 113	val_113
 113	val_113
+114	val_114
+116	val_116
 118	val_118
 118	val_118
 119	val_119
 119	val_119
 119	val_119
-12	val_12
-12	val_12
 125	val_125
 125	val_125
-136	val_136
 137	val_137
 137	val_137
 138	val_138
 138	val_138
 138	val_138
 138	val_138
-143	val_143
-150	val_150
-153	val_153
-156	val_156
+145	val_145
+146	val_146
+146	val_146
+15	val_15
+15	val_15
+155	val_155
 158	val_158
-160	val_160
-162	val_162
-163	val_163
 164	val_164
 164	val_164
 165	val_165
 165	val_165
-166	val_166
-167	val_167
-167	val_167
-167	val_167
-168	val_168
-174	val_174
-174	val_174
-175	val_175
-175	val_175
-176	val_176
-176	val_176
+172	val_172
+172	val_172
 177	val_177
+178	val_178
+179	val_179
+179	val_179
 18	val_18
 18	val_18
-180	val_180
+181	val_181
 183	val_183
 186	val_186
+187	val_187
+187	val_187
+187	val_187
+189	val_189
+19	val_19
 190	val_190
-193	val_193
-193	val_193
-193	val_193
-196	val_196
+191	val_191
+191	val_191
+192	val_192
+194	val_194
+195	val_195
+195	val_195
 197	val_197
 197	val_197
-205	val_205
-205	val_205
-209	val_209
-209	val_209
+199	val_199
+199	val_199
+199	val_199
+2	val_2
+200	val_200
+200	val_200
+202	val_202
+207	val_207
+207	val_207
+208	val_208
+208	val_208
+208	val_208
+214	val_214
+216	val_216
+216	val_216
 217	val_217
 217	val_217
 219	val_219
 219	val_219
-221	val_221
-221	val_221
-226	val_226
+222	val_222
+224	val_224
+224	val_224
+228	val_228
+229	val_229
+229	val_229
 230	val_230
 230	val_230
 230	val_230
 230	val_230
 230	val_230
+235	val_235
 238	val_238
 238	val_238
-242	val_242
-242	val_242
-247	val_247
-248	val_248
+244	val_244
 249	val_249
 252	val_252
+257	val_257
+258	val_258
 260	val_260
-263	val_263
-272	val_272
-272	val_272
-274	val_274
-277	val_277
-277	val_277
-277	val_277
-277	val_277
-281	val_281
-281	val_281
+262	val_262
+265	val_265
+265	val_265
+266	val_266
+27	val_27
+273	val_273
+273	val_273
+273	val_273
+278	val_278
+278	val_278
+28	val_28
+280	val_280
+280	val_280
 283	val_283
-289	val_289
-296	val_296
+284	val_284
+288	val_288
+288	val_288
+291	val_291
+30	val_30
+305	val_305
 306	val_306
-307	val_307
-307	val_307
-308	val_308
-309	val_309
-309	val_309
+311	val_311
+311	val_311
+311	val_311
 315	val_315
+316	val_316
+316	val_316
+316	val_316
 317	val_317
 317	val_317
-318	val_318
-318	val_318
-318	val_318
+321	val_321
+321	val_321
 322	val_322
 322	val_322
-325	val_325
-325	val_325
-327	val_327
-327	val_327
-327	val_327
+33	val_33
 331	val_331
 331	val_331
-34	val_34
-341	val_341
+336	val_336
 342	val_342
 342	val_342
+344	val_344
+344	val_344
 345	val_345
-348	val_348
-348	val_348
-348	val_348
-348	val_348
-348	val_348
 35	val_35
 35	val_35
 35	val_35
 351	val_351
+353	val_353
+353	val_353
+364	val_364
 365	val_365
 366	val_366
-367	val_367
-367	val_367
-374	val_374
-375	val_375
-379	val_379
-382	val_382
-382	val_382
+368	val_368
+369	val_369
+369	val_369
+369	val_369
+373	val_373
+378	val_378
+386	val_386
 389	val_389
 393	val_393
 394	val_394
-399	val_399
-399	val_399
+395	val_395
+395	val_395
+396	val_396
+396	val_396
+396	val_396
+397	val_397
+397	val_397
 4	val_4
 400	val_400
-401	val_401
-401	val_401
-401	val_401
-401	val_401
-401	val_401
-403	val_403
-403	val_403
-403	val_403
+404	val_404
+404	val_404
 406	val_406
 406	val_406
 406	val_406
 406	val_406
-409	val_409
-409	val_409
-409	val_409
+407	val_407
 41	val_41
-413	val_413
-413	val_413
+411	val_411
 414	val_414
 414	val_414
+418	val_418
 421	val_421
-427	val_427
-429	val_429
-429	val_429
-431	val_431
-431	val_431
-431	val_431
-435	val_435
-438	val_438
-438	val_438
-438	val_438
-439	val_439
-439	val_439
-44	val_44
-443	val_443
+424	val_424
+424	val_424
+436	val_436
+444	val_444
 446	val_446
+448	val_448
+449	val_449
 452	val_452
+453	val_453
+454	val_454
+454	val_454
+454	val_454
 455	val_455
-458	val_458
-458	val_458
 460	val_460
-462	val_462
-462	val_462
 463	val_463
 463	val_463
-466	val_466
-466	val_466
-466	val_466
-467	val_467
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-469	val_469
-470	val_470
-472	val_472
-475	val_475
-478	val_478
-478	val_478
+468	val_468
+468	val_468
+468	val_468
+468	val_468
+47	val_47
+477	val_477
 480	val_480
 480	val_480
 480	val_480
+482	val_482
 484	val_484
-487	val_487
+485	val_485
+490	val_490
 491	val_491
+492	val_492
+492	val_492
+493	val_493
+497	val_497
 498	val_498
 498	val_498
 498	val_498
-5	val_5
-5	val_5
-5	val_5
-51	val_51
-51	val_51
 53	val_53
 54	val_54
-58	val_58
-58	val_58
-64	val_64
-66	val_66
-69	val_69
-70	val_70
-70	val_70
-70	val_70
-77	val_77
+65	val_65
+67	val_67
+67	val_67
 78	val_78
-83	val_83
-83	val_83
-84	val_84
-84	val_84
-90	val_90
-90	val_90
-90	val_90
+8	val_8
+80	val_80
+85	val_85
+86	val_86
+87	val_87
+92	val_92
 95	val_95
 95	val_95
+96	val_96
+97	val_97
+97	val_97
 98	val_98
 98	val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/subquery_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_select.q.out b/ql/src/test/results/clientpositive/spark/subquery_select.q.out
index edbd4d2..ee154df 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_select.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_select.q.out
@@ -142,16 +142,13 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+1	false
 10	false
 12	false
-14	false
-14	false
-23	false
+19	false
 28	false
-31	false
+34	false
 42	false
-45	false
-1	false
 2	false
 2	false
 2	false
@@ -159,14 +156,17 @@ POSTHOOK: Input: default@part
 6	false
 6	false
 7	false
+14	false
+14	false
 17	false
 18	false
-19	false
+23	false
 25	false
 27	false
-34	false
+31	false
 39	false
 40	false
+45	false
 46	true
 PREHOOK: query: EXPLAIN SELECT p_size, p_size IN (
         SELECT MAX(p_size) FROM part p where p.p_type = part.p_type)
@@ -326,32 +326,32 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-7	true
 1	true
 40	true
-23	true
+34	true
+42	true
 14	true
 19	true
 2	true
-17	false
 6	true
+2	true
+2	true
+39	true
 10	true
-12	true
+27	true
 6	true
+18	true
+45	true
+7	true
 46	true
-34	true
-42	true
+23	true
+17	false
 31	true
 14	true
 2	true
-2	true
-39	true
-2	true
-27	true
 25	true
 28	true
-18	true
-45	true
+12	true
 Warning: Shuffle Join JOIN[21][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain SELECT p_size, p_size NOT IN (
         SELECT MAX(p_size) FROM part)
@@ -496,16 +496,13 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+1	true
 10	true
 12	true
-14	true
-14	true
-23	true
+19	true
 28	true
-31	true
+34	true
 42	true
-45	true
-1	true
 2	true
 2	true
 2	true
@@ -513,14 +510,17 @@ POSTHOOK: Input: default@part
 6	true
 6	true
 7	true
+14	true
+14	true
 17	true
 18	true
-19	true
+23	true
 25	true
 27	true
-34	true
+31	true
 39	true
 40	true
+45	true
 46	false
 PREHOOK: query: EXPLAIN SELECT p_size, p_size NOT IN (
         SELECT MAX(p_size) FROM part p where p.p_type = part.p_type)
@@ -742,32 +742,32 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-7	false
 1	false
 40	false
-23	false
+34	false
+42	false
 14	false
 19	false
 2	false
-17	true
 6	false
+2	false
+2	false
+39	false
 10	false
-12	false
+27	false
 6	false
+18	false
+45	false
+7	false
 46	false
-34	false
-42	false
+23	false
+17	true
 31	false
 14	false
 2	false
-2	false
-39	false
-2	false
-27	false
 25	false
 28	false
-18	false
-45	false
+12	false
 Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain SELECT p_size, EXISTS(SELECT p_size FROM part)
 FROM part
@@ -999,31 +999,31 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	true
 1	true
-23	true
+34	true
 42	true
-14	true
+19	true
 2	true
+14	true
 6	true
+39	true
 2	true
-2	true
-10	true
-2	true
-12	true
+27	true
 6	true
 18	true
 7	true
-46	true
 40	true
-34	true
-19	true
+23	true
+14	true
 17	true
 31	true
-14	true
-39	true
-27	true
+2	true
+2	true
+10	true
 25	true
 28	true
+12	true
 45	true
 Warning: Shuffle Join JOIN[11][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain SELECT p_size, NOT EXISTS(SELECT p_size FROM part)
@@ -1256,31 +1256,31 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	false
 1	false
-23	false
+34	false
 42	false
-14	false
+19	false
 2	false
+14	false
 6	false
+39	false
 2	false
-2	false
-10	false
-2	false
-12	false
+27	false
 6	false
 18	false
 7	false
-46	false
 40	false
-34	false
-19	false
+23	false
+14	false
 17	false
 31	false
-14	false
-39	false
-27	false
+2	false
+2	false
+10	false
 25	false
 28	false
+12	false
 45	false
 PREHOOK: query: explain select p_size, (select count(p_name) from part p where p.p_type = part.p_name) from part
 PREHOOK: type: QUERY
@@ -1388,31 +1388,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 31	0
+2	0
+2	0
 17	0
-34	0
+10	0
 6	0
-14	0
+19	0
+6	0
+2	0
 39	0
 28	0
 46	0
-27	0
-42	0
-25	0
 18	0
-7	0
 12	0
 23	0
-2	0
-2	0
+34	0
 14	0
-10	0
-19	0
 1	0
 45	0
-6	0
-2	0
+14	0
 40	0
+27	0
 2	0
+42	0
+25	0
+7	0
 PREHOOK: query: explain select p_size, (select max(p_name) from part p where p.p_type = part.p_name) from part
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select p_size, (select max(p_name) from part p where p.p_type = part.p_name) from part
@@ -1519,31 +1519,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 31	NULL
+2	NULL
+2	NULL
 17	NULL
-34	NULL
+10	NULL
 6	NULL
-14	NULL
+19	NULL
+6	NULL
+2	NULL
 39	NULL
 28	NULL
 46	NULL
-27	NULL
-42	NULL
-25	NULL
 18	NULL
-7	NULL
 12	NULL
 23	NULL
-2	NULL
-2	NULL
+34	NULL
 14	NULL
-10	NULL
-19	NULL
 1	NULL
 45	NULL
-6	NULL
-2	NULL
+14	NULL
 40	NULL
+27	NULL
 2	NULL
+42	NULL
+25	NULL
+7	NULL
 Warning: Shuffle Join JOIN[10][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 PREHOOK: query: explain SELECT p_size, (SELECT max(p_size) FROM part)
     FROM part
@@ -2006,10 +2006,6 @@ where b.key in
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-92	val_92
-95	val_95
-95	val_95
-96	val_96
 90	val_90
 90	val_90
 90	val_90
@@ -2017,6 +2013,10 @@ POSTHOOK: Input: default@src
 97	val_97
 98	val_98
 98	val_98
+92	val_92
+95	val_95
+95	val_95
+96	val_96
 PREHOOK: query: CREATE table tnull(i int)
 PREHOOK: type: CREATETABLE
 PREHOOK: Output: database:default
@@ -2186,16 +2186,13 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 POSTHOOK: Input: default@tnull
 #### A masked pattern was here ####
+1	NULL
 10	NULL
 12	NULL
-14	NULL
-14	NULL
-23	NULL
+19	NULL
 28	NULL
-31	NULL
+34	NULL
 42	NULL
-45	NULL
-1	NULL
 2	NULL
 2	NULL
 2	NULL
@@ -2203,14 +2200,17 @@ POSTHOOK: Input: default@tnull
 6	NULL
 6	NULL
 7	NULL
+14	NULL
+14	NULL
 17	NULL
 18	NULL
-19	NULL
+23	NULL
 25	NULL
 27	NULL
-34	NULL
+31	NULL
 39	NULL
 40	NULL
+45	NULL
 46	NULL
 PREHOOK: query: CREATE TABLE tempty(i int)
 PREHOOK: type: CREATETABLE
@@ -2583,31 +2583,31 @@ POSTHOOK: query: SELECT p_size, 1+(SELECT max(p_size) FROM part p
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	47
 1	2
-23	24
+34	35
 42	43
-14	15
+19	20
 2	3
+14	15
 6	7
+39	40
 2	3
-2	3
-10	11
-2	3
-12	13
+27	28
 6	7
 18	19
 7	8
-46	47
 40	41
-34	35
-19	20
+23	24
+14	15
 17	32
 31	32
-14	15
-39	40
-27	28
+2	3
+2	3
+10	11
 25	26
 28	29
+12	13
 45	46
 PREHOOK: query: explain SELECT p_size, (SELECT count(p_size) FROM part p
     WHERE p.p_type = part.p_type) IS NULL from part
@@ -2718,31 +2718,31 @@ POSTHOOK: query: SELECT p_size, (SELECT count(p_size) FROM part p
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	false
 1	false
-23	false
+34	false
 42	false
-14	false
+19	false
 2	false
+14	false
 6	false
+39	false
 2	false
-2	false
-10	false
-2	false
-12	false
+27	false
 6	false
 18	false
 7	false
-46	false
 40	false
-34	false
-19	false
+23	false
+14	false
 17	false
 31	false
-14	false
-39	false
-27	false
+2	false
+2	false
+10	false
 25	false
 28	false
+12	false
 45	false
 Warning: Shuffle Join JOIN[23][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 Warning: Shuffle Join JOIN[26][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
@@ -3189,31 +3189,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 31	true
+2	false
+2	false
 17	false
-34	false
+10	false
 6	false
-14	false
+19	false
+6	false
+2	false
 39	false
 28	false
 46	false
-27	false
-42	false
-25	false
 18	false
-7	false
 12	false
 23	false
-2	false
-2	false
+34	false
 14	false
-10	false
-19	false
 1	false
 45	false
-6	false
-2	false
+14	false
 40	false
+27	false
 2	false
+42	false
+25	false
+7	false
 PREHOOK: query: explain SELECT p_size, NOT EXISTS(SELECT p_size FROM part pp where pp.p_type = part.p_type)
 FROM part
 PREHOOK: type: QUERY
@@ -3320,31 +3320,31 @@ FROM part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	false
 1	false
-23	false
+34	false
 42	false
-14	false
+19	false
 2	false
+14	false
 6	false
+39	false
 2	false
-2	false
-10	false
-2	false
-12	false
+27	false
 6	false
 18	false
 7	false
-46	false
 40	false
-34	false
-19	false
+23	false
+14	false
 17	false
 31	false
-14	false
-39	false
-27	false
+2	false
+2	false
+10	false
 25	false
 28	false
+12	false
 45	false
 Warning: Shuffle Join JOIN[12][tables = [$hdt$_1, $hdt$_2]] in Work 'Reducer 5' is a cross product
 Warning: Shuffle Join JOIN[41][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
@@ -3583,16 +3583,13 @@ POSTHOOK: query: select p_size, (p_size IN
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+1	false
 10	false
 12	false
-14	false
-14	false
-23	false
+19	false
 28	false
-31	false
+34	false
 42	false
-45	false
-1	false
 2	false
 2	false
 2	false
@@ -3600,14 +3597,17 @@ POSTHOOK: Input: default@part
 6	false
 6	false
 7	false
+14	false
+14	false
 17	false
 18	false
-19	false
+23	false
 25	false
 27	false
-34	false
+31	false
 39	false
 40	false
+45	false
 46	true
 Warning: Shuffle Join JOIN[25][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 Warning: Shuffle Join JOIN[28][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
@@ -4167,17 +4167,17 @@ POSTHOOK: query: select o.p_size, (select count(distinct p_type) from part p whe
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	1
+27	1
 39	1
 23	1
 28	1
-25	1
+45	1
+40	1
 31	1
-46	1
-27	1
 42	1
 34	1
-45	1
-40	1
+25	1
 Warning: Shuffle Join JOIN[28][tables = [$hdt$_0, $hdt$_1]] in Work 'Reducer 2' is a cross product
 Warning: Shuffle Join JOIN[31][tables = [$hdt$_0, $hdt$_1, $hdt$_2]] in Work 'Reducer 3' is a cross product
 Warning: Shuffle Join JOIN[34][tables = [$hdt$_0, $hdt$_1, $hdt$_2, $hdt$_3]] in Work 'Reducer 4' is a cross product
@@ -5249,31 +5249,31 @@ POSTHOOK: query: select t1.p_size,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	1	28
+14	1	28
+1	1	28
+6	1	28
+27	1	28
 39	1	28
 10	1	28
 23	1	28
 28	1	28
+17	1	28
 14	1	28
 6	1	28
-2	2	28
-2	2	28
-25	1	28
+19	1	28
+45	1	28
 2	1	28
+40	1	28
 31	1	28
-46	1	28
-14	1	28
 7	1	28
 12	1	28
-1	1	28
-6	1	28
-27	1	28
 42	1	28
 34	1	28
-17	1	28
-19	1	28
-45	1	28
+2	2	28
+2	2	28
+25	1	28
 2	1	28
-40	1	28
 18	1	28
 PREHOOK: query: explain SELECT p_size, exp((SELECT max(p_size) FROM part p WHERE p.p_type = part.p_type)) from part
 PREHOOK: type: QUERY
@@ -5380,29 +5380,29 @@ POSTHOOK: query: SELECT p_size, exp((SELECT max(p_size) FROM part p WHERE p.p_ty
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+46	9.496119420602448E19
 1	2.718281828459045
-23	9.744803446248903E9
+34	5.834617425274549E14
 42	1.73927494152050099E18
-14	1202604.2841647768
+19	1.7848230096318725E8
 2	7.38905609893065
+14	1202604.2841647768
 6	403.4287934927351
+39	8.6593400423993744E16
 2	7.38905609893065
-2	7.38905609893065
-10	22026.465794806718
-2	7.38905609893065
-12	162754.79141900392
+27	5.3204824060179865E11
 6	403.4287934927351
 18	6.565996913733051E7
 7	1096.6331584284585
-46	9.496119420602448E19
 40	2.3538526683702E17
-34	5.834617425274549E14
-19	1.7848230096318725E8
+23	9.744803446248903E9
+14	1202604.2841647768
 17	2.9048849665247426E13
 31	2.9048849665247426E13
-14	1202604.2841647768
-39	8.6593400423993744E16
-27	5.3204824060179865E11
+2	7.38905609893065
+2	7.38905609893065
+10	22026.465794806718
 25	7.200489933738588E10
 28	1.446257064291475E12
+12	162754.79141900392
 45	3.4934271057485095E19

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/subquery_shared_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_shared_alias.q.out b/ql/src/test/results/clientpositive/spark/subquery_shared_alias.q.out
index f907f91..0507ab7 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_shared_alias.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_shared_alias.q.out
@@ -10,14 +10,14 @@ where src.key in (select key from src where key > '9')
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-92	val_92
-96	val_96
-97	val_97
-97	val_97
 90	val_90
 90	val_90
 90	val_90
+92	val_92
 95	val_95
 95	val_95
+96	val_96
+97	val_97
+97	val_97
 98	val_98
 98	val_98

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
index d2598dc..5b80833 100644
--- a/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
+++ b/ql/src/test/results/clientpositive/spark/transform_ppr1.q.out
@@ -99,6 +99,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -147,6 +148,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -195,6 +197,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -243,6 +246,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
index d08ace6..366b40e 100644
--- a/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
+++ b/ql/src/test/results/clientpositive/spark/transform_ppr2.q.out
@@ -101,6 +101,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -149,6 +150,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out b/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
index edeab0b..38965e7 100644
--- a/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
+++ b/ql/src/test/results/clientpositive/spark/truncate_column_buckets.q.out
@@ -30,8 +30,8 @@ test_tab GROUP BY INPUT__FILE__NAME
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-258
-242
+248
+252
 PREHOOK: query: TRUNCATE TABLE test_tab COLUMNS (value)
 PREHOOK: type: TRUNCATETABLE
 PREHOOK: Input: default@test_tab
@@ -54,5 +54,5 @@ test_tab GROUP BY INPUT__FILE__NAME
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_tab
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-258
-242
+248
+252

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union22.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union22.q.out b/ql/src/test/results/clientpositive/spark/union22.q.out
index 5425fa2..d3cb5dc 100644
--- a/ql/src/test/results/clientpositive/spark/union22.q.out
+++ b/ql/src/test/results/clientpositive/spark/union22.q.out
@@ -142,6 +142,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k0,k1,k2,k3,k4,k5
                       columns.comments 
@@ -191,6 +192,7 @@ STAGE PLANS:
                             output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                             properties:
                               bucket_count -1
+                              bucketing_version 2
                               column.name.delimiter ,
                               columns k1,k2,k3,k4
                               columns.comments 
@@ -243,6 +245,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k0,k1,k2,k3,k4,k5
                       columns.comments 
@@ -307,6 +310,7 @@ STAGE PLANS:
                                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                                 properties:
                                   bucket_count -1
+                                  bucketing_version 2
                                   column.name.delimiter ,
                                   columns k1,k2,k3,k4
                                   columns.comments 
@@ -361,6 +365,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns k1,k2,k3,k4
                       columns.comments 
@@ -391,6 +396,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns k1,k2,k3,k4
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union24.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union24.q.out b/ql/src/test/results/clientpositive/spark/union24.q.out
index 145869f..4344eca 100644
--- a/ql/src/test/results/clientpositive/spark/union24.q.out
+++ b/ql/src/test/results/clientpositive/spark/union24.q.out
@@ -126,6 +126,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -147,6 +148,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -213,6 +215,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -234,6 +237,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -300,6 +304,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -321,6 +326,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -376,6 +382,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -397,6 +404,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -584,6 +592,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -605,6 +614,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -671,6 +681,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -692,6 +703,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -744,6 +756,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -765,6 +778,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -818,6 +832,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -839,6 +854,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -1020,6 +1036,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -1041,6 +1058,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -1107,6 +1125,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -1128,6 +1147,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -1180,6 +1200,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -1201,6 +1222,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 
@@ -1253,6 +1275,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,count
                     columns.comments 
@@ -1274,6 +1297,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true"}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,count
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_ppr.q.out b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
index c8e678c..551d4f0 100644
--- a/ql/src/test/results/clientpositive/spark/union_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_ppr.q.out
@@ -88,6 +88,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -136,6 +137,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -215,6 +217,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -263,6 +266,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
index a619efd..696eb63 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_1.q.out
@@ -155,6 +155,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	4                   
 	totalSize           	40                  
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
index 0e86bb1..b9c1ee6 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_10.q.out
@@ -230,8 +230,9 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	4                   
-	totalSize           	348                 
+	totalSize           	350                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
index c4cf2bb..524feb5 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_11.q.out
@@ -220,6 +220,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
 	totalSize           	273                 
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
index 57a9af7..a9d60cb 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_12.q.out
@@ -222,6 +222,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	totalSize           	194                 
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
index 0d21cba..f3ea93f 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_13.q.out
@@ -244,8 +244,9 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
-	totalSize           	269                 
+	totalSize           	271                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
index 57a9af7..a9d60cb 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_14.q.out
@@ -222,6 +222,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	totalSize           	194                 
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
index 58b9688..ef905cf 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_15.q.out
@@ -172,11 +172,12 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	4                   
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	332                 
+	totalSize           	336                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
index 94ee97e..1cd9905 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_16.q.out
@@ -214,11 +214,12 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	4                   
 	numPartitions       	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
-	totalSize           	332                 
+	totalSize           	336                 
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
index 7715683..b83ff69 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_17.q.out
@@ -150,6 +150,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	2                   
 	numPartitions       	2                   
 	numRows             	0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
index 1c570c9..f03ef83 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_18.q.out
@@ -184,6 +184,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	12                  
 	numPartitions       	6                   
 	numRows             	0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
index 5d28f00..340a1bc 100644
--- a/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
+++ b/ql/src/test/results/clientpositive/spark/union_remove_19.q.out
@@ -155,6 +155,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	4                   
 	totalSize           	40                  
 #### A masked pattern was here ####