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:40 UTC

[35/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/llap/metadataonly1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
index c705f64..52b3565 100644
--- a/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
+++ b/ql/src/test/results/clientpositive/llap/metadataonly1.q.out
@@ -174,6 +174,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -315,6 +316,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -456,6 +458,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -604,6 +607,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -651,6 +655,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -728,6 +733,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -775,6 +781,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1012,6 +1019,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1059,6 +1067,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1106,6 +1115,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1257,6 +1267,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1305,6 +1316,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1353,6 +1365,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1500,6 +1513,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1546,6 +1560,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1631,8 +1646,8 @@ POSTHOOK: Input: default@srcpart@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpart@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-2008-04-08
 2008-04-09
+2008-04-08
 PREHOOK: query: select min(ds),max(ds) from srcpart
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpart
@@ -1745,6 +1760,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1792,6 +1808,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1839,6 +1856,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1886,6 +1904,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 
@@ -1933,6 +1952,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns a,b
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/mm_all.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/mm_all.q.out b/ql/src/test/results/clientpositive/llap/mm_all.q.out
index 7c8a38f..8a5c9d0 100644
--- a/ql/src/test/results/clientpositive/llap/mm_all.q.out
+++ b/ql/src/test/results/clientpositive/llap/mm_all.q.out
@@ -1815,6 +1815,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	3                   
 	numRows             	6                   
 	rawDataSize         	13                  
@@ -1864,6 +1865,7 @@ Retention:          	0
 #### A masked pattern was here ####
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 	numFiles            	6                   
 	numRows             	12                  
 	rawDataSize         	26                  
@@ -1922,6 +1924,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{}                  
+	bucketing_version   	2                   
 	numFiles            	55                  
 	numRows             	500                 
 	rawDataSize         	5312                

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
index 559173c..3e267e3 100644
--- a/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
+++ b/ql/src/test/results/clientpositive/llap/multiMapJoin1.q.out
@@ -659,12 +659,12 @@ POSTHOOK: Input: default@smalltbl1
 POSTHOOK: Input: default@smalltbl2
 #### A masked pattern was here ####
 RUN: Stage-1:MAPRED
+270
 10
+270
 10
 10
 10
-270
-270
 PREHOOK: query: drop table bigTbl
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@bigtbl

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
index 7092837..3e40653 100644
--- a/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_column_in.q.out
@@ -305,8 +305,8 @@ select * from emps where (empno,deptno) in ((1,2),(3,2))
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emps
 #### A masked pattern was here ####
-2	5	22
 1	2	11
+2	5	22
 PREHOOK: query: drop view v
 PREHOOK: type: DROPVIEW
 POSTHOOK: query: drop view v
@@ -342,8 +342,8 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emps
 POSTHOOK: Input: default@v
 #### A masked pattern was here ####
-2	5	22
 1	2	11
+2	5	22
 PREHOOK: query: select subq.e1 from 
 (select (empno*2)|1 as e1, substr(empname,1,1) as n1 from emps)subq
 join

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
index c210c4c..dcda13b 100644
--- a/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
+++ b/ql/src/test/results/clientpositive/llap/multi_count_distinct_null.q.out
@@ -292,23 +292,23 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@employee
 POSTHOOK: Output: hdfs://### HDFS PATH ###
 5	NULL	NULL	NULL
-2	NULL	NULL	1
+5	NULL	M	NULL
 2	1	NULL	1
-2	1	NULL	3
-3	4	NULL	NULL
-2	4	NULL	1
-3	NULL	NULL	NULL
-6	NULL	NULL	NULL
-6	NULL	NULL	2
-5	NULL	F	NULL
-3	1	NULL	NULL
+2	2	NULL	1
 2	2	NULL	3
+2	NULL	NULL	1
 6	NULL	NULL	3
-3	2	NULL	NULL
-2	2	NULL	1
-2	NULL	NULL	NULL
-6	NULL	NULL	1
-5	NULL	M	NULL
+5	NULL	F	NULL
 2	1	NULL	2
+2	NULL	NULL	NULL
+6	NULL	NULL	NULL
 3	3	NULL	NULL
+3	NULL	NULL	NULL
+6	NULL	NULL	1
+6	NULL	NULL	2
+3	1	NULL	NULL
+2	1	NULL	3
+3	2	NULL	NULL
 2	3	NULL	2
+3	4	NULL	NULL
+2	4	NULL	1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
index 39f1ea8..d73d4d1 100644
--- a/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
+++ b/ql/src/test/results/clientpositive/llap/optimize_nullscan.q.out
@@ -180,6 +180,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -201,6 +202,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -280,6 +282,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'
@@ -327,6 +330,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'
@@ -374,6 +378,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'
@@ -421,6 +426,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'
@@ -573,6 +579,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -594,6 +601,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -673,6 +681,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'
@@ -721,6 +730,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'
@@ -769,6 +779,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'
@@ -817,6 +828,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'
@@ -981,6 +993,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1002,6 +1015,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -1081,6 +1095,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'
@@ -1128,6 +1143,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'
@@ -1175,6 +1191,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'
@@ -1222,6 +1239,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'
@@ -1389,6 +1407,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1410,6 +1429,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -1459,6 +1479,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1480,6 +1501,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -1622,6 +1644,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1643,6 +1666,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -1693,6 +1717,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1714,6 +1739,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -1839,6 +1865,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -1860,6 +1887,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       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/llap/orc_analyze.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
index fd33bfd..cde05b3 100644
--- a/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_analyze.q.out
@@ -98,6 +98,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -145,6 +146,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -231,6 +233,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\",\"state\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	100                 
 	rawDataSize         	52600               
@@ -727,8 +730,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -769,7 +772,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -821,8 +824,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -863,7 +866,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -964,8 +967,8 @@ Partition Parameters:
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"address\":\"true\",\"first_name\":\"true\",\"id\":\"true\",\"last_name\":\"true\",\"salary\":\"true\",\"start_date\":\"true\"}}
 	numFiles            	4                   
 	numRows             	50                  
-	rawDataSize         	21975               
-	totalSize           	5260                
+	rawDataSize         	21955               
+	totalSize           	5322                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -1006,7 +1009,7 @@ Partition Parameters:
 	numFiles            	4                   
 	numRows             	50                  
 	rawDataSize         	22043               
-	totalSize           	5331                
+	totalSize           	5314                
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/orc_create.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_create.q.out b/ql/src/test/results/clientpositive/llap/orc_create.q.out
index 72d94e5..df286b2 100644
--- a/ql/src/test/results/clientpositive/llap/orc_create.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_create.q.out
@@ -66,6 +66,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"lst\":\"true\",\"mp\":\"true\",\"str\":\"true\",\"strct\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -119,6 +120,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numPartitions       	0                   
 	numRows             	0                   
@@ -176,6 +178,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numPartitions       	0                   
 	numRows             	0                   
@@ -223,6 +226,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	0                   
 	numPartitions       	0                   
@@ -281,6 +285,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numPartitions       	0                   
 	numRows             	0                   
@@ -336,6 +341,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"lst\":\"true\",\"mp\":\"true\",\"str\":\"true\",\"strct\":\"true\"}}
+	bucketing_version   	2                   
 	numFiles            	0                   
 	numRows             	0                   
 	rawDataSize         	0                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
index af237ea..98d9e06 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters.q.out
@@ -227,6 +227,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	2100                
 	orc.bloom.filter.columns	*                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
index 01fb4af..c078326 100644
--- a/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
+++ b/ql/src/test/results/clientpositive/llap/orc_llap_counters1.q.out
@@ -227,6 +227,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 	numFiles            	1                   
 	numRows             	2100                
 	orc.bloom.filter.columns	*                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/parquet_types.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_types.q.out b/ql/src/test/results/clientpositive/llap/parquet_types.q.out
index 4d7c5fd..508ac16 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_types.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_types.q.out
@@ -369,7 +369,7 @@ POSTHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbina
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
 #### A masked pattern was here ####
-68692CCAC0BDE7	10
+B4F3CAFDBEDD	10
 	1
 68656C6C6F	1
-B4F3CAFDBEDD	10
+68692CCAC0BDE7	10

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
index c786ba3..f67c5bc 100644
--- a/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
+++ b/ql/src/test/results/clientpositive/llap/parquet_types_vectorization.q.out
@@ -843,7 +843,7 @@ POSTHOOK: query: SELECT hex(cbinary), count(*) FROM parquet_types GROUP BY cbina
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@parquet_types
 POSTHOOK: Output: hdfs://### HDFS PATH ###
-68692CCAC0BDE7	10
+B4F3CAFDBEDD	10
 	1
 68656C6C6F	1
-B4F3CAFDBEDD	10
+68692CCAC0BDE7	10

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
index fb60ce3..a210e8a 100644
--- a/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_multilevels.q.out
@@ -470,18 +470,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	111	11	11
 2222	222	22	16
-2222	222	44	18
-2222	333	11	19
 2222	333	44	22
-2222	111	22	12
+2222	222	44	18
+2222	333	33	21
 2222	111	33	13
 2222	222	11	15
 2222	333	22	20
-2222	222	33	17
-2222	333	33	21
+2222	111	11	11
+2222	111	22	12
 2222	111	44	14
+2222	222	33	17
+2222	333	11	19
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 >= '2222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -514,18 +514,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	222	11	15
-2222	222	22	16
-2222	333	33	21
+2222	333	44	22
+2222	111	11	11
 2222	111	33	13
+2222	222	11	15
 2222	222	44	18
-2222	333	11	19
 2222	333	22	20
-2222	333	44	22
-2222	111	11	11
-2222	111	22	12
+2222	333	33	21
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+2222	333	11	19
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 !='2222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -558,18 +558,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	11	15
-1111	222	44	18
-1111	333	22	20
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
 1111	222	22	16
 1111	222	33	17
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	222	11	15
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
+1111	111	44	14
+1111	222	44	18
+1111	333	11	19
+1111	111	11	11
+1111	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -594,14 +594,14 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
 #### A masked pattern was here ####
-2222	222	33	17
 1111	222	22	16
 1111	222	44	18
-2222	222	44	18
-1111	222	11	15
+2222	222	33	17
 1111	222	33	17
-2222	222	22	16
 2222	222	11	15
+2222	222	22	16
+1111	222	11	15
+2222	222	44	18
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 <= '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -642,22 +642,22 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
 #### A masked pattern was here ####
+1111	222	22	16
+1111	222	33	17
+1111	111	33	13
 1111	222	11	15
-2222	222	11	15
-2222	222	22	16
-1111	222	44	18
+2222	111	11	11
 2222	111	33	13
+2222	222	11	15
 2222	222	44	18
-1111	111	22	12
-1111	111	33	13
 1111	111	44	14
-1111	222	22	16
-1111	222	33	17
-1111	111	11	11
-2222	111	11	11
-2222	111	22	12
+1111	222	44	18
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+1111	111	11	11
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 != '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -698,22 +698,22 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	333	33	21
-1111	333	22	20
-2222	111	33	13
-2222	333	11	19
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
-2222	333	22	20
 2222	333	44	22
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
 2222	111	11	11
-2222	111	22	12
+2222	111	33	13
+2222	333	22	20
+2222	333	33	21
+1111	111	44	14
+1111	333	11	19
 2222	111	44	14
+2222	333	11	19
+1111	111	11	11
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -734,12 +734,12 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=22
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
 #### A masked pattern was here ####
-1111	333	22	20
-2222	222	22	16
-1111	222	22	16
-1111	111	22	12
 2222	111	22	12
+2222	222	22	16
+1111	333	22	20
 2222	333	22	20
+1111	111	22	12
+1111	222	22	16
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 >= '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -784,24 +784,24 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	222	22	16
-2222	333	33	21
-1111	222	44	18
-1111	333	22	20
-2222	111	33	13
-2222	222	44	18
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
 1111	222	22	16
 1111	222	33	17
-2222	333	22	20
 2222	333	44	22
+1111	111	33	13
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
-2222	111	22	12
+2222	111	33	13
+2222	222	44	18
+2222	333	22	20
+2222	333	33	21
+1111	111	44	14
+1111	222	44	18
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 != '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -846,24 +846,24 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	11	15
-2222	222	11	15
-2222	333	33	21
-1111	222	44	18
-2222	111	33	13
-2222	222	44	18
-2222	333	11	19
-1111	111	33	13
-1111	111	44	14
 1111	222	33	17
 2222	333	44	22
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	222	11	15
 1111	333	33	21
 1111	333	44	22
 2222	111	11	11
+2222	111	33	13
+2222	222	11	15
+2222	222	44	18
+2222	333	33	21
+1111	111	44	14
+1111	222	44	18
+1111	333	11	19
 2222	111	44	14
 2222	222	33	17
+2222	333	11	19
+1111	111	11	11
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -880,10 +880,10 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
-1111	333	33	21
 2222	222	33	17
-1111	222	33	17
+1111	333	33	21
 2222	333	33	21
+1111	222	33	17
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 <= '1111' and level3 >= '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -904,12 +904,12 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	44	18
-1111	111	33	13
-1111	111	44	14
 1111	222	33	17
+1111	111	33	13
 1111	333	33	21
 1111	333	44	22
+1111	111	44	14
+1111	222	44	18
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -931,11 +931,11 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
 2222	222	22	16
-2222	333	11	19
+2222	333	33	21
 2222	222	11	15
 2222	333	22	20
 2222	222	33	17
-2222	333	33	21
+2222	333	11	19
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -957,11 +957,11 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
 2222	222	22	16
-2222	333	11	19
+2222	333	33	21
 2222	222	11	15
 2222	333	22	20
 2222	222	33	17
-2222	333	33	21
+2222	333	11	19
 PREHOOK: query: explain select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
@@ -1060,18 +1060,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	111	11	11
 2222	222	22	16
-2222	222	44	18
-2222	333	11	19
 2222	333	44	22
-2222	111	22	12
+2222	222	44	18
+2222	333	33	21
 2222	111	33	13
 2222	222	11	15
 2222	333	22	20
-2222	222	33	17
-2222	333	33	21
+2222	111	11	11
+2222	111	22	12
 2222	111	44	14
+2222	222	33	17
+2222	333	11	19
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 >= '2222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1104,18 +1104,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	222	11	15
-2222	222	22	16
-2222	333	33	21
+2222	333	44	22
+2222	111	11	11
 2222	111	33	13
+2222	222	11	15
 2222	222	44	18
-2222	333	11	19
 2222	333	22	20
-2222	333	44	22
-2222	111	11	11
-2222	111	22	12
+2222	333	33	21
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+2222	333	11	19
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 !='2222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1148,18 +1148,18 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	11	15
-1111	222	44	18
-1111	333	22	20
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
 1111	222	22	16
 1111	222	33	17
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	222	11	15
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
+1111	111	44	14
+1111	222	44	18
+1111	333	11	19
+1111	111	11	11
+1111	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 = '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1184,14 +1184,14 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
 #### A masked pattern was here ####
-2222	222	33	17
 1111	222	22	16
 1111	222	44	18
-2222	222	44	18
-1111	222	11	15
+2222	222	33	17
 1111	222	33	17
-2222	222	22	16
 2222	222	11	15
+2222	222	22	16
+1111	222	11	15
+2222	222	44	18
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 <= '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1232,22 +1232,22 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=44
 #### A masked pattern was here ####
+1111	222	22	16
+1111	222	33	17
+1111	111	33	13
 1111	222	11	15
-2222	222	11	15
-2222	222	22	16
-1111	222	44	18
+2222	111	11	11
 2222	111	33	13
+2222	222	11	15
 2222	222	44	18
-1111	111	22	12
-1111	111	33	13
 1111	111	44	14
-1111	222	22	16
-1111	222	33	17
-1111	111	11	11
-2222	111	11	11
-2222	111	22	12
+1111	222	44	18
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+1111	111	11	11
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 != '222' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1288,22 +1288,22 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	333	33	21
-1111	333	22	20
-2222	111	33	13
-2222	333	11	19
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
-2222	333	22	20
 2222	333	44	22
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
 2222	111	11	11
-2222	111	22	12
+2222	111	33	13
+2222	333	22	20
+2222	333	33	21
+1111	111	44	14
+1111	333	11	19
 2222	111	44	14
+2222	333	11	19
+1111	111	11	11
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 = '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1324,12 +1324,12 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=111/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=22
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=22
 #### A masked pattern was here ####
-1111	333	22	20
-2222	222	22	16
-1111	222	22	16
-1111	111	22	12
 2222	111	22	12
+2222	222	22	16
+1111	333	22	20
 2222	333	22	20
+1111	111	22	12
+1111	222	22	16
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 >= '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1374,24 +1374,24 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-2222	222	22	16
-2222	333	33	21
-1111	222	44	18
-1111	333	22	20
-2222	111	33	13
-2222	222	44	18
-1111	111	22	12
-1111	111	33	13
-1111	111	44	14
 1111	222	22	16
 1111	222	33	17
-2222	333	22	20
 2222	333	44	22
+1111	111	33	13
+1111	333	22	20
 1111	333	33	21
 1111	333	44	22
-2222	111	22	12
+2222	111	33	13
+2222	222	44	18
+2222	333	22	20
+2222	333	33	21
+1111	111	44	14
+1111	222	44	18
 2222	111	44	14
+2222	222	22	16
 2222	222	33	17
+1111	111	22	12
+2222	111	22	12
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level3 != '22' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1436,24 +1436,24 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	11	15
-2222	222	11	15
-2222	333	33	21
-1111	222	44	18
-2222	111	33	13
-2222	222	44	18
-2222	333	11	19
-1111	111	33	13
-1111	111	44	14
 1111	222	33	17
 2222	333	44	22
-1111	111	11	11
-1111	333	11	19
+1111	111	33	13
+1111	222	11	15
 1111	333	33	21
 1111	333	44	22
 2222	111	11	11
+2222	111	33	13
+2222	222	11	15
+2222	222	44	18
+2222	333	33	21
+1111	111	44	14
+1111	222	44	18
+1111	333	11	19
 2222	111	44	14
 2222	222	33	17
+2222	333	11	19
+1111	111	11	11
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level2 >= '222' and level3 = '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1470,10 +1470,10 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=222/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
-1111	333	33	21
 2222	222	33	17
-1111	222	33	17
+1111	333	33	21
 2222	333	33	21
+1111	222	33	17
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 <= '1111' and level3 >= '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1494,12 +1494,12 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=222/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=33
 POSTHOOK: Input: default@partition_test_multilevel@level1=1111/level2=333/level3=44
 #### A masked pattern was here ####
-1111	222	44	18
-1111	111	33	13
-1111	111	44	14
 1111	222	33	17
+1111	111	33	13
 1111	333	33	21
 1111	333	44	22
+1111	111	44	14
+1111	222	44	18
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where level1 = '2222' and level2 >= '222' and level3 <= '33' group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1521,11 +1521,11 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
 2222	222	22	16
-2222	333	11	19
+2222	333	33	21
 2222	222	11	15
 2222	333	22	20
 2222	222	33	17
-2222	333	33	21
+2222	333	11	19
 PREHOOK: query: select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
 PREHOOK: Input: default@partition_test_multilevel
@@ -1547,11 +1547,11 @@ POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3
 POSTHOOK: Input: default@partition_test_multilevel@level1=2222/level2=333/level3=33
 #### A masked pattern was here ####
 2222	222	22	16
-2222	333	11	19
+2222	333	33	21
 2222	222	11	15
 2222	333	22	20
 2222	222	33	17
-2222	333	33	21
+2222	333	11	19
 PREHOOK: query: explain select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select level1, level2, level3, count(*) from partition_test_multilevel where (level1 = '2222') and (level2 between '222' and '333') and (level3 between '11' and '33') group by level1, level2, level3

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
index 520e714..829ab15 100644
--- a/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
+++ b/ql/src/test/results/clientpositive/llap/partition_pruning.q.out
@@ -134,6 +134,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns customer
                 columns.comments 
@@ -203,6 +204,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns customer
                 columns.comments 
@@ -248,6 +250,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns customer
                 columns.comments 
@@ -317,6 +320,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns customer
                 columns.comments 
@@ -362,6 +366,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns customer
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
index 00b5e88..5a6ff13 100644
--- a/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
+++ b/ql/src/test/results/clientpositive/llap/ppd_union_view.q.out
@@ -253,6 +253,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns keymap,value
                       columns.comments 
@@ -334,6 +335,7 @@ STAGE PLANS:
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,keymap
                       columns.comments 
@@ -535,6 +537,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 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
index 67ab4fe..9c271a7 100644
--- a/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
+++ b/ql/src/test/results/clientpositive/llap/quotedid_smb.q.out
@@ -128,17 +128,17 @@ POSTHOOK: Input: default@src_b2
 0	val_0	0	val_0
 0	val_0	0	val_0
 0	val_0	0	val_0
-103	val_103	103	val_103
-103	val_103	103	val_103
-103	val_103	103	val_103
-103	val_103	103	val_103
+104	val_104	104	val_104
+104	val_104	104	val_104
+104	val_104	104	val_104
+104	val_104	104	val_104
 105	val_105	105	val_105
 10	val_10	10	val_10
 100	val_100	100	val_100
 100	val_100	100	val_100
 100	val_100	100	val_100
 100	val_100	100	val_100
-104	val_104	104	val_104
-104	val_104	104	val_104
-104	val_104	104	val_104
-104	val_104	104	val_104
+103	val_103	103	val_103
+103	val_103	103	val_103
+103	val_103	103	val_103
+103	val_103	103	val_103

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
index 68c2af2..28b7aed 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate.q.out
@@ -60,6 +60,7 @@ STAGE PLANS:
                   properties:
                     COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 'default','default'
@@ -82,6 +83,7 @@ STAGE PLANS:
                     properties:
                       COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 'default','default'
@@ -124,6 +126,7 @@ STAGE PLANS:
                         COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                         bucket_count 2
                         bucket_field_name key
+                        bucketing_version 2
                         column.name.delimiter ,
                         columns key,value
                         columns.comments 
@@ -195,6 +198,7 @@ STAGE PLANS:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
                 bucket_count 2
                 bucket_field_name key
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value
                 columns.comments 
@@ -385,6 +389,7 @@ STAGE PLANS:
                         output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                         properties:
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns aid,bid,t,ctime,etime,l,et
                           columns.comments 
@@ -474,6 +479,7 @@ STAGE PLANS:
               output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
               properties:
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns aid,bid,t,ctime,etime,l,et
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
index fb421e2..5d39ebe 100644
--- a/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
+++ b/ql/src/test/results/clientpositive/llap/reduce_deduplicate_extended.q.out
@@ -1856,21 +1856,21 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-213	426.0
-238	476.0
-406	1624.0
-66	66.0
-278	556.0
-150	150.0
 224	448.0
-255	510.0
 273	819.0
-369	1107.0
 401	2005.0
-128	384.0
 146	292.0
+150	150.0
 311	933.0
+369	1107.0
+66	66.0
+128	384.0
+213	426.0
+406	1624.0
 98	196.0
+238	476.0
+255	510.0
+278	556.0
 PREHOOK: query: select src.key, src.value FROM src JOIN src1 ON src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -4386,21 +4386,21 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Input: default@src1
 #### A masked pattern was here ####
-213	426.0
-238	476.0
-406	1624.0
-66	66.0
-278	556.0
-150	150.0
 224	448.0
-255	510.0
 273	819.0
-369	1107.0
 401	2005.0
-128	384.0
 146	292.0
+150	150.0
 311	933.0
+369	1107.0
+66	66.0
+128	384.0
+213	426.0
+406	1624.0
 98	196.0
+238	476.0
+255	510.0
+278	556.0
 PREHOOK: query: select src.key, src.value FROM src JOIN src1 ON src.key = src1.key order by src.key, src.value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
index ebd2300..cb122f5 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_1.q.out
@@ -481,10 +481,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 8	val_8
-2	val_2
 4	val_4
-5	val_5
 9	val_9
+5	val_5
+2	val_2
 test.comment="Intersect/Except. Cache should be used now"
 PREHOOK: query: explain
 with q1 as ( select distinct key, value from src ),
@@ -522,10 +522,10 @@ select * from q1 intersect all select * from q2 except all select * from q3
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 8	val_8
-2	val_2
 4	val_4
-5	val_5
 9	val_9
+5	val_5
+2	val_2
 PREHOOK: query: select a, c, count(*)  from (select key as a, c_int+1 as b, sum(c_int) as c from cbo_t1 where (cbo_t1.c_int + 1 >= 0) and (cbo_t1.c_int > 0 or cbo_t1.c_float >= 0)  group by c_float, cbo_t1.c_int, key having cbo_t1.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by a+b desc, c asc limit 5) cbo_t1 left semi join (select key as p, c_int+1 as q, sum(c_int) as r from cbo_t2 where (cbo_t2.c_int + 1 >= 0) and (cbo_t2.c_int > 0 or cbo_t2.c_float >= 0)  group by c_float, cbo_t2.c_int, key having cbo_t2.c_float > 0 and (c_int >=1 or c_float >= 1) and (c_int + c_float) >= 0 order by q+r/10 desc, p limit 5) cbo_t2 on cbo_t1.a=p left semi join cbo_t3 on cbo_t1.a=key where (b + 1  >= 0) and (b > 0 or a >= 0) group by a, c  having a > 0 and (a >=1 or c >= 1) and (a + c) >= 0 order by c, a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@cbo_t1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
index 36043f4..260b8c9 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_capacity.q.out
@@ -187,12 +187,12 @@ POSTHOOK: query: select key, count(*) from src where key < 10 group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-8	1
+5	3
 9	1
-4	1
-2	1
 0	3
-5	3
+2	1
+4	1
+8	1
 PREHOOK: query: explain
 select key, count(*) from src where key < 10 group by key
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
index d2d8275..afa43af 100644
--- a/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
+++ b/ql/src/test/results/clientpositive/llap/results_cache_with_masking.q.out
@@ -81,10 +81,10 @@ POSTHOOK: query: select key, count(*) from masking_test group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@masking_test
 #### A masked pattern was here ####
-4	1
+8	1
 0	3
+4	1
 2	1
-8	1
 PREHOOK: query: explain
 select key, count(*) from masking_test group by key
 PREHOOK: type: QUERY
@@ -110,7 +110,7 @@ POSTHOOK: query: select key, count(*) from masking_test group by key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@masking_test
 #### A masked pattern was here ####
-4	1
+8	1
 0	3
+4	1
 2	1
-8	1

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/sample1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample1.q.out b/ql/src/test/results/clientpositive/llap/sample1.q.out
index 3458ee2..583ac35 100644
--- a/ql/src/test/results/clientpositive/llap/sample1.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample1.q.out
@@ -57,6 +57,7 @@ STAGE PLANS:
                             properties:
                               COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                               bucket_count -1
+                              bucketing_version 2
                               column.name.delimiter ,
                               columns key,value,dt,hr
                               columns.comments 
@@ -130,6 +131,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'
@@ -193,6 +195,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE {"BASIC_STATS":"true","COLUMN_STATS":{"dt":"true","hr":"true","key":"true","value":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value,dt,hr
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/sample10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sample10.q.out b/ql/src/test/results/clientpositive/llap/sample10.q.out
index 8552a3a..93b4d83 100644
--- a/ql/src/test/results/clientpositive/llap/sample10.q.out
+++ b/ql/src/test/results/clientpositive/llap/sample10.q.out
@@ -34,10 +34,10 @@ POSTHOOK: Lineage: srcpartbucket PARTITION(ds=2008-04-09,hr=11).value SIMPLE [(s
 POSTHOOK: Lineage: srcpartbucket PARTITION(ds=2008-04-09,hr=12).key SIMPLE [(srcpart)srcpart.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: srcpartbucket PARTITION(ds=2008-04-09,hr=12).value SIMPLE [(srcpart)srcpart.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: explain extended
-select ds, count(1) from srcpartbucket tablesample (bucket 1 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
+select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
 PREHOOK: type: QUERY
 POSTHOOK: query: explain extended
-select ds, count(1) from srcpartbucket tablesample (bucket 1 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
+select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
@@ -60,8 +60,8 @@ STAGE PLANS:
                   GatherStats: false
                   Filter Operator
                     isSamplingPred: true
-                    predicate: (((hash(key) & 2147483647) % 4) = 0) (type: boolean)
-                    sampleDesc: BUCKET 1 OUT OF 4
+                    predicate: (((hash(key) & 2147483647) % 4) = 1) (type: boolean)
+                    sampleDesc: BUCKET 2 OUT OF 4
                     Statistics: Num rows: 20 Data size: 5380 Basic stats: COMPLETE Column stats: COMPLETE
                     Select Operator
                       expressions: ds (type: string)
@@ -89,7 +89,7 @@ STAGE PLANS:
             Path -> Partition:
 #### A masked pattern was here ####
                 Partition
-                  base file name: 000000_0
+                  base file name: 000002_0
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   partition values:
@@ -122,6 +122,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -139,7 +140,7 @@ STAGE PLANS:
                   name: default.srcpartbucket
 #### A masked pattern was here ####
                 Partition
-                  base file name: 000000_0
+                  base file name: 000002_0
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   partition values:
@@ -172,6 +173,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -189,7 +191,7 @@ STAGE PLANS:
                   name: default.srcpartbucket
 #### A masked pattern was here ####
                 Partition
-                  base file name: 000000_0
+                  base file name: 000002_0
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   partition values:
@@ -222,6 +224,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -239,7 +242,7 @@ STAGE PLANS:
                   name: default.srcpartbucket
 #### A masked pattern was here ####
                 Partition
-                  base file name: 000000_0
+                  base file name: 000002_0
                   input format: org.apache.hadoop.hive.ql.io.RCFileInputFormat
                   output format: org.apache.hadoop.hive.ql.io.RCFileOutputFormat
                   partition values:
@@ -272,6 +275,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -288,10 +292,10 @@ STAGE PLANS:
                     name: default.srcpartbucket
                   name: default.srcpartbucket
             Truncated Path -> Alias:
-              /srcpartbucket/ds=2008-04-08/hr=11/000000_0 [srcpartbucket]
-              /srcpartbucket/ds=2008-04-08/hr=12/000000_0 [srcpartbucket]
-              /srcpartbucket/ds=2008-04-09/hr=11/000000_0 [srcpartbucket]
-              /srcpartbucket/ds=2008-04-09/hr=12/000000_0 [srcpartbucket]
+              /srcpartbucket/ds=2008-04-08/hr=11/000002_0 [srcpartbucket]
+              /srcpartbucket/ds=2008-04-08/hr=12/000002_0 [srcpartbucket]
+              /srcpartbucket/ds=2008-04-09/hr=11/000002_0 [srcpartbucket]
+              /srcpartbucket/ds=2008-04-09/hr=12/000002_0 [srcpartbucket]
         Reducer 2 
             Execution mode: llap
             Needs Tagging: false
@@ -347,7 +351,7 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-PREHOOK: query: select ds, count(1) from srcpartbucket tablesample (bucket 1 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
+PREHOOK: query: select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpartbucket
 PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
@@ -355,7 +359,7 @@ PREHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
 PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
 PREHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-POSTHOOK: query: select ds, count(1) from srcpartbucket tablesample (bucket 1 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
+POSTHOOK: query: select ds, count(1) from srcpartbucket tablesample (bucket 2 out of 4 on key) where ds is not null group by ds ORDER BY ds ASC
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@srcpartbucket
 POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=11
@@ -363,8 +367,6 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-2008-04-08	10
-2008-04-09	10
 PREHOOK: query: select ds, count(1) from srcpartbucket tablesample (bucket 1 out of 2 on key) where ds is not null group by ds ORDER BY ds ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpartbucket
@@ -381,8 +383,6 @@ POSTHOOK: Input: default@srcpartbucket@ds=2008-04-08/hr=12
 POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=11
 POSTHOOK: Input: default@srcpartbucket@ds=2008-04-09/hr=12
 #### A masked pattern was here ####
-2008-04-08	12
-2008-04-09	12
 PREHOOK: query: select * from srcpartbucket where ds is not null ORDER BY key ASC, value ASC, ds ASC, hr ASC
 PREHOOK: type: QUERY
 PREHOOK: Input: default@srcpartbucket

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
index e76eaf8..2aff794 100644
--- a/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
+++ b/ql/src/test/results/clientpositive/llap/schema_evol_stats.q.out
@@ -78,6 +78,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
 	numPartitions       	2                   
@@ -283,6 +284,7 @@ Retention:          	0
 Table Type:         	MANAGED_TABLE       	 
 Table Parameters:	 	 
 	COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\"}
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	numFiles            	2                   
 	numPartitions       	2                   

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
index a9d090d..fbf2fa5 100644
--- a/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
+++ b/ql/src/test/results/clientpositive/llap/selectDistinctStar.q.out
@@ -1392,6 +1392,7 @@ Database:           	default
 Retention:          	0                   	 
 Table Type:         	VIRTUAL_VIEW        	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 
@@ -3853,6 +3854,7 @@ Database:           	default
 Retention:          	0                   	 
 Table Type:         	VIRTUAL_VIEW        	 
 Table Parameters:	 	 
+	bucketing_version   	2                   
 #### A masked pattern was here ####
 	 	 
 # Storage Information	 	 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out b/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out
index 74f98ed..667692a 100644
--- a/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out
+++ b/ql/src/test/results/clientpositive/llap/skiphf_aggr.q.out
@@ -91,9 +91,9 @@ POSTHOOK: Input: default@skiphtbl
 POSTHOOK: Input: default@skiphtbl@b=1
 POSTHOOK: Input: default@skiphtbl@b=2
 #### A masked pattern was here ####
+3
 4
 2
-3
 PREHOOK: query: INSERT OVERWRITE TABLE skipHTbl PARTITION (b = 1) VALUES (1)
 PREHOOK: type: QUERY
 PREHOOK: Input: _dummy_database@_dummy_table
@@ -150,9 +150,9 @@ POSTHOOK: Input: default@skiphtbl
 POSTHOOK: Input: default@skiphtbl@b=1
 POSTHOOK: Input: default@skiphtbl@b=2
 #### A masked pattern was here ####
+3
 4
 2
-3
 PREHOOK: query: DROP TABLE IF EXISTS skipFTbl
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE IF EXISTS skipFTbl
@@ -247,8 +247,8 @@ POSTHOOK: Input: default@skipftbl@b=1
 POSTHOOK: Input: default@skipftbl@b=2
 #### A masked pattern was here ####
 1
-2
 3
+2
 PREHOOK: query: DROP TABLE skipHTbl
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@skiphtbl

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
index 490afb6..ddb5942 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_15.q.out
@@ -89,6 +89,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -112,6 +113,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -169,6 +171,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -192,6 +195,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -403,6 +407,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -426,6 +431,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -483,6 +489,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -506,6 +513,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -665,6 +673,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -688,6 +697,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -745,6 +755,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -768,6 +779,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -927,6 +939,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -950,6 +963,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments 
@@ -1007,6 +1021,7 @@ STAGE PLANS:
                     SORTBUCKETCOLSPREFIX TRUE
                     bucket_count 16
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,key2,value
                     columns.comments 
@@ -1030,6 +1045,7 @@ STAGE PLANS:
                       SORTBUCKETCOLSPREFIX TRUE
                       bucket_count 16
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,key2,value
                       columns.comments