http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out 
b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out
index 6580938..c85f205 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_18.q.out
@@ -147,7 +147,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
@@ -158,7 +158,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -200,7 +200,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-247
+243
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 2 out of 
2) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -211,7 +211,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-253
+257
 PREHOOK: query: EXPLAIN
 INSERT OVERWRITE TABLE test_table2 PARTITION (ds = '2')
 SELECT a.key, a.value FROM test_table1 a WHERE a.ds = '1' and a.key = 238

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out 
b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out
index 97e7451..b86c7f1 100644
--- a/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out
+++ b/ql/src/test/results/clientpositive/llap/smb_mapjoin_19.q.out
@@ -169,7 +169,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-40
+19
 PREHOOK: query: select count(*) from test_table1 tablesample (bucket 13 out of 
16) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table1
@@ -180,7 +180,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table1
 POSTHOOK: Input: default@test_table1@ds=1
 #### A masked pattern was here ####
-29
+33
 PREHOOK: query: select count(*) from test_table2 where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -244,7 +244,7 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-40
+19
 PREHOOK: query: select count(*) from test_table2 tablesample (bucket 13 out of 
16) s where ds = '1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table2
@@ -255,4 +255,4 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table2
 POSTHOOK: Input: default@test_table2@ds=1
 #### A masked pattern was here ####
-29
+33

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/stats11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/stats11.q.out 
b/ql/src/test/results/clientpositive/llap/stats11.q.out
index 22be814..a53b296 100644
--- a/ql/src/test/results/clientpositive/llap/stats11.q.out
+++ b/ql/src/test/results/clientpositive/llap/stats11.q.out
@@ -346,6 +346,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -367,6 +368,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -447,6 +449,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -494,6 +497,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -575,6 +579,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 
@@ -766,6 +771,7 @@ STAGE PLANS:
                   properties:
                     bucket_count 2
                     bucket_field_name key
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns key,value
                     columns.comments 
@@ -787,6 +793,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 2
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -867,6 +874,7 @@ STAGE PLANS:
                     properties:
                       bucket_count 4
                       bucket_field_name key
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns key,value
                       columns.comments 
@@ -914,6 +922,7 @@ STAGE PLANS:
                         properties:
                           COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                           bucket_count -1
+                          bucketing_version 2
                           column.name.delimiter ,
                           columns key,value1,value2
                           columns.comments 
@@ -995,6 +1004,7 @@ STAGE PLANS:
               properties:
                 COLUMN_STATS_ACCURATE 
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value1":"true","value2":"true"}}
                 bucket_count -1
+                bucketing_version 2
                 column.name.delimiter ,
                 columns key,value1,value2
                 columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out 
b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
index 2190dfd..0617a28 100644
--- a/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
+++ b/ql/src/test/results/clientpositive/llap/subquery_notin.q.out
@@ -1241,21 +1241,21 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@lineitem
 #### A masked pattern was here ####
 22630  1
-59694  1
-106170 1
-123076 1
-139636 1
+119477 1
 450    1
-61931  1
-119767 1
-175839 1
 7068   1
-88362  1
+61931  1
+88035  1
+123076 1
 182052 1
 21636  1
+88362  1
+106170 1
+119767 1
+139636 1
+175839 1
+59694  1
 85951  1
-88035  1
-119477 1
 Warning: Shuffle Join MERGEJOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Reducer 2' is a cross product
 PREHOOK: query: select * 
 from src 
@@ -3656,37 +3656,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 ####
-430    3
-128    3
-369    3
-316    3
-199    3
-454    3
-384    3
-311    3
-208    3
-298    3
-187    3
-273    3
+438    3
 417    3
-396    3
-409    3
 403    3
-35     3
+5      3
+384    3
+298    3
+193    3
+128    3
 90     3
-438    3
-327    3
-480    3
 466    3
-318    3
-193    3
+187    3
+369    3
+316    3
+311    3
+119    3
 498    3
-5      3
+480    3
+35     3
+273    3
 0      3
-167    3
-119    3
+208    3
+199    3
+454    3
+396    3
+430    3
 431    3
+167    3
 70     3
+318    3
+409    3
+327    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 )
@@ -3954,37 +3954,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 ####
-430    3
-128    3
-369    3
-316    3
-199    3
-454    3
-384    3
-311    3
-208    3
-298    3
-187    3
-273    3
+438    3
 417    3
-396    3
-409    3
 403    3
-35     3
+5      3
+384    3
+298    3
+193    3
+128    3
 90     3
-438    3
-327    3
-480    3
 466    3
-318    3
-193    3
+187    3
+369    3
+316    3
+311    3
+119    3
 498    3
-5      3
+480    3
+35     3
+273    3
 0      3
-167    3
-119    3
+208    3
+199    3
+454    3
+396    3
+430    3
 431    3
+167    3
 70     3
+318    3
+409    3
+327    3
 Warning: Shuffle Join MERGEJOIN[38][tables = [$hdt$_0, $hdt$_1]] in Stage 
'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

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/sysdb.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/sysdb.q.out 
b/ql/src/test/results/clientpositive/llap/sysdb.q.out
index 7d977d3..de20f2d 100644
--- a/ql/src/test/results/clientpositive/llap/sysdb.q.out
+++ b/ql/src/test/results/clientpositive/llap/sysdb.q.out
@@ -58,34 +58,10 @@ default     alltypesorc                     hive_test_user  
USER    DELETE  true    -1      hive_test_user
 default        alltypesorc                     hive_test_user  USER    INSERT  
true    -1      hive_test_user
 default        alltypesorc                     hive_test_user  USER    SELECT  
true    -1      hive_test_user
 default        alltypesorc                     hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        alltypesparquet                 hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t1                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t2                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        cbo_t3                  hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        lineitem                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        lineitem                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
 default        moretypes                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
 default        moretypes                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
 default        moretypes                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
 default        moretypes                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        part                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        part                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
 default        scr_txn                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
 default        scr_txn                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
 default        scr_txn                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
@@ -94,46 +70,14 @@ default     src                     hive_test_user  USER    
DELETE  true    -1      hive_test_user
 default        src                     hive_test_user  USER    INSERT  true    
-1      hive_test_user
 default        src                     hive_test_user  USER    SELECT  true    
-1      hive_test_user
 default        src                     hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src1                    hive_test_user  USER    UPDATE  true    
-1      hive_test_user
 default        src_buck                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
 default        src_buck                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
 default        src_buck                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
 default        src_buck                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_cbo                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        src_cbo                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
-default        src_json                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_json                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
DELETE  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
INSERT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
SELECT  true    -1      hive_test_user
-default        src_sequencefile                        hive_test_user  USER    
UPDATE  true    -1      hive_test_user
 default        src_skew                        hive_test_user  USER    DELETE  
true    -1      hive_test_user
 default        src_skew                        hive_test_user  USER    INSERT  
true    -1      hive_test_user
 default        src_skew                        hive_test_user  USER    SELECT  
true    -1      hive_test_user
 default        src_skew                        hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        src_thrift                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket                       hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    DELETE  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    INSERT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    SELECT  
true    -1      hive_test_user
-default        srcbucket2                      hive_test_user  USER    UPDATE  
true    -1      hive_test_user
-default        srcpart                 hive_test_user  USER    DELETE  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    INSERT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    SELECT  true    
-1      hive_test_user
-default        srcpart                 hive_test_user  USER    UPDATE  true    
-1      hive_test_user
 PREHOOK: query: DROP DATABASE IF EXISTS SYS CASCADE
 PREHOOK: type: DROPDATABASE
 POSTHOOK: query: DROP DATABASE IF EXISTS SYS CASCADE
@@ -3192,8 +3136,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@bucketing_cols
 #### A masked pattern was here ####
 key    0
-key    0
-key    0
 value  0
 PREHOOK: query: select count(*) from cds
 PREHOOK: type: QUERY
@@ -3203,7 +3145,7 @@ POSTHOOK: query: select count(*) from cds
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@cds
 #### A masked pattern was here ####
-71
+57
 PREHOOK: query: select column_name, type_name, integer_idx from columns_v2 
order by column_name, integer_idx limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@columns_v2
@@ -3215,8 +3157,8 @@ POSTHOOK: Input: sys@columns_v2
 a      decimal(10,2)   0
 action_expression      string  3
 add_time       int     1
-aint   int     0
 alloc_fraction double  2
+avg_col_len    double  14
 PREHOOK: query: select param_key, param_value from database_params order by 
param_key, param_value limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@database_params
@@ -3256,11 +3198,6 @@ POSTHOOK: query: select part_name from partitions order 
by part_name limit 5
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@partitions
 #### A masked pattern was here ####
-ds=2008-04-08/hr=11
-ds=2008-04-08/hr=12
-ds=2008-04-09/hr=11
-ds=2008-04-09/hr=12
-dt=2014
 PREHOOK: query: select pkey_name, pkey_type from partition_keys order by 
pkey_name limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@partition_keys
@@ -3269,10 +3206,6 @@ POSTHOOK: query: select pkey_name, pkey_type from 
partition_keys order by pkey_n
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@partition_keys
 #### A masked pattern was here ####
-ds     string
-dt     string
-dt     string
-hr     string
 PREHOOK: query: select part_key_val, integer_idx from partition_key_vals order 
by part_key_val, integer_idx limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@partition_key_vals
@@ -3281,11 +3214,6 @@ POSTHOOK: query: select part_key_val, integer_idx from 
partition_key_vals order
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@partition_key_vals
 #### A masked pattern was here ####
-11     1
-11     1
-12     1
-12     1
-2008-04-08     0
 PREHOOK: query: select param_key, param_value from partition_params order by 
param_key, param_value limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@partition_params
@@ -3294,11 +3222,6 @@ POSTHOOK: query: select param_key, param_value from 
partition_params order by pa
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@partition_params
 #### A masked pattern was here ####
-COLUMN_STATS_ACCURATE  
{"BASIC_STATS":"true","COLUMN_STATS":{"c_boolean":"true","c_float":"true","c_int":"true","key":"true","value":"true"}}
-COLUMN_STATS_ACCURATE  
{"BASIC_STATS":"true","COLUMN_STATS":{"c_boolean":"true","c_float":"true","c_int":"true","key":"true","value":"true"}}
-COLUMN_STATS_ACCURATE  
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
-COLUMN_STATS_ACCURATE  
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
-COLUMN_STATS_ACCURATE  
{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}
 PREHOOK: query: select grantor, principal_name from part_col_privs order by 
grantor, principal_name limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@part_col_privs
@@ -3341,7 +3264,7 @@ POSTHOOK: query: select count(*) from sds
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@sds
 #### A masked pattern was here ####
-77
+57
 PREHOOK: query: select param_key, param_value from sd_params order by 
param_key, param_value limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@sd_params
@@ -3360,9 +3283,9 @@ POSTHOOK: Input: sys@sequence_table
 #### A masked pattern was here ####
 org.apache.hadoop.hive.metastore.model.MCatalog
 org.apache.hadoop.hive.metastore.model.MColumnDescriptor
+org.apache.hadoop.hive.metastore.model.MCreationMetadata
 org.apache.hadoop.hive.metastore.model.MDatabase
 org.apache.hadoop.hive.metastore.model.MFunction
-org.apache.hadoop.hive.metastore.model.MGlobalPrivilege
 PREHOOK: query: select name, slib from serdes order by name, slib limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@serdes
@@ -3384,11 +3307,11 @@ POSTHOOK: query: select param_key, param_value from 
serde_params order by param_
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@serde_params
 #### A masked pattern was here ####
-field.delim    ,
-field.delim    ,
-field.delim    ,
-field.delim    ,
-field.delim    ,
+serialization.format   1
+serialization.format   1
+serialization.format   1
+serialization.format   1
+serialization.format   1
 PREHOOK: query: select skewed_col_name from skewed_col_names order by 
skewed_col_name limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@skewed_col_names
@@ -3464,10 +3387,10 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@tbls
 #### A masked pattern was here ####
 alltypesorc
-alltypesparquet
 bucketing_cols
-cbo_t1
-cbo_t2
+cds
+column_privileges
+columns
 PREHOOK: query: select column_name, grantor, principal_name from tbl_col_privs 
order by column_name, principal_name limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@tbl_col_privs
@@ -3515,16 +3438,6 @@ POSTHOOK: query: select table_name, partition_name, 
column_name, num_nulls, num_
 POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@part_col_stats
 #### A masked pattern was here ####
-cbo_t1 dt=2014 c_boolean       2       NULL
-cbo_t1 dt=2014 c_float 2       1
-cbo_t1 dt=2014 c_int   2       1
-cbo_t1 dt=2014 key     2       4
-cbo_t1 dt=2014 value   2       4
-cbo_t2 dt=2014 c_boolean       2       NULL
-cbo_t2 dt=2014 c_float 2       2
-cbo_t2 dt=2014 c_int   2       2
-cbo_t2 dt=2014 key     2       5
-cbo_t2 dt=2014 value   2       5
 PREHOOK: query: select schema_version from version order by schema_version 
limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@version
@@ -3566,11 +3479,11 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@table_params
 POSTHOOK: Input: sys@table_stats_view
 #### A masked pattern was here ####
-{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true"}}   0       0       0       0
-{"BASIC_STATS":"true","COLUMN_STATS":{"entity_name":"true","entity_type":"true","ordering":"true","pool_path":"true","rp_name":"true"}}
        0       0       0       0
-{"BASIC_STATS":"true","COLUMN_STATS":{"integer_idx":"true","sd_id":"true","skewed_col_name":"true"}}
   0       0       0       0
-#### A masked pattern was here ####
-{"BASIC_STATS":"true","COLUMN_STATS":{"db_id":"true","param_key":"true","param_value":"true"}}
 0       0       0       0
+{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}    0       
0       0       0
+{"BASIC_STATS":"true","COLUMN_STATS":{"pool_path":"true","rp_name":"true","trigger_name":"true"}}
      0       0       0       0
+{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}    0       
0       0       0
+{"BASIC_STATS":"true","COLUMN_STATS":{"a":"true","b":"true","c":"true","d":"true","e":"true","f":"true","g":"true"}}
   0       0       0       0
+{"BASIC_STATS":"true","COLUMN_STATS":{"create_time":"true","last_access_time":"true","part_id":"true","part_name":"true","sd_id":"true","tbl_id":"true"}}
      0       0       0       0
 PREHOOK: query: select COLUMN_STATS_ACCURATE, NUM_FILES, NUM_ROWS, 
RAW_DATA_SIZE, TOTAL_SIZE FROM PARTITION_STATS_VIEW where COLUMN_STATS_ACCURATE 
is not null order by NUM_FILES, NUM_ROWS, RAW_DATA_SIZE limit 5
 PREHOOK: type: QUERY
 PREHOOK: Input: sys@partition_params
@@ -3581,11 +3494,6 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: sys@partition_params
 POSTHOOK: Input: sys@partition_stats_view
 #### A masked pattern was here ####
-{"BASIC_STATS":"true","COLUMN_STATS":{"c_boolean":"true","c_float":"true","c_int":"true","key":"true","value":"true"}}
 1       20      262     282
-{"BASIC_STATS":"true","COLUMN_STATS":{"c_boolean":"true","c_float":"true","c_int":"true","key":"true","value":"true"}}
 1       20      262     282
-{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}    1       
500     5312    5812
-{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}    1       
500     5312    5812
-{"BASIC_STATS":"true","COLUMN_STATS":{"key":"true","value":"true"}}    1       
500     5312    5812
 PREHOOK: query: describe sys.tab_col_stats
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: sys@tab_col_stats
@@ -3708,25 +3616,11 @@ POSTHOOK: Input: sys@dbs
 POSTHOOK: Input: sys@tbls
 #### A masked pattern was here ####
 default        default alltypesorc     BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default alltypesparquet BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default cbo_t1  BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
-default        default cbo_t2  BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
-default        default cbo_t3  BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
-default        default lineitem        BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
 default        default moretypes       BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default part    BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
 default        default scr_txn BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
 default        default src     BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
-default        default src1    BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
 default        default src_buck        BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default src_cbo BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
-default        default src_json        BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default src_sequencefile        BASE_TABLE      NULL    NULL    
NULL    NULL    NULL    YES     NO      NULL
 default        default src_skew        BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default src_thrift      BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default srcbucket       BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default srcbucket2      BASE_TABLE      NULL    NULL    NULL    
NULL    NULL    YES     NO      NULL
-default        default srcpart BASE_TABLE      NULL    NULL    NULL    NULL    
NULL    YES     NO      NULL
 default        information_schema      column_privileges       VIEW    NULL    
NULL    NULL    NULL    NULL    NO      NO      NULL
 default        information_schema      columns VIEW    NULL    NULL    NULL    
NULL    NULL    NO      NO      NULL
 default        information_schema      schemata        VIEW    NULL    NULL    
NULL    NULL    NULL    NO      NO      NULL
@@ -3796,12 +3690,12 @@ hive_test_user  hive_test_user  default default 
alltypesorc     DELETE  YES     NO
 hive_test_user hive_test_user  default default alltypesorc     INSERT  YES     
NO
 hive_test_user hive_test_user  default default alltypesorc     SELECT  YES     
NO
 hive_test_user hive_test_user  default default alltypesorc     UPDATE  YES     
NO
-hive_test_user hive_test_user  default default alltypesparquet DELETE  YES     
NO
-hive_test_user hive_test_user  default default alltypesparquet INSERT  YES     
NO
-hive_test_user hive_test_user  default default alltypesparquet SELECT  YES     
NO
-hive_test_user hive_test_user  default default alltypesparquet UPDATE  YES     
NO
-hive_test_user hive_test_user  default default cbo_t1  DELETE  YES     NO
-hive_test_user hive_test_user  default default cbo_t1  INSERT  YES     NO
+hive_test_user hive_test_user  default default moretypes       DELETE  YES     
NO
+hive_test_user hive_test_user  default default moretypes       INSERT  YES     
NO
+hive_test_user hive_test_user  default default moretypes       SELECT  YES     
NO
+hive_test_user hive_test_user  default default moretypes       UPDATE  YES     
NO
+hive_test_user hive_test_user  default default scr_txn DELETE  YES     NO
+hive_test_user hive_test_user  default default scr_txn INSERT  YES     NO
 PREHOOK: query: select * from COLUMNS where TABLE_NAME = 'alltypesorc' or 
TABLE_NAME = 'moretypes' order by TABLE_SCHEMA, TABLE_NAME, ORDINAL_POSITION
 PREHOOK: type: QUERY
 PREHOOK: Input: information_schema@columns
@@ -3818,25 +3712,25 @@ POSTHOOK: Input: sys@dbs
 POSTHOOK: Input: sys@sds
 POSTHOOK: Input: sys@tbls
 #### A masked pattern was here ####
-default        default alltypesorc     ctinyint        0       NULL    YES     
tinyint NULL    NULL    3       10      NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     tinyint 3       10
-default        default alltypesorc     csmallint       1       NULL    YES     
smallint        NULL    NULL    5       10      NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     smallint        
5       10
-default        default alltypesorc     cint    2       NULL    YES     int     
NULL    NULL    10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     int     10      10
-default        default alltypesorc     cbigint 3       NULL    YES     bigint  
NULL    NULL    19      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     bigint  19      10
-default        default alltypesorc     cfloat  4       NULL    YES     float   
NULL    NULL    23      2       NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     float   23      2
-default        default alltypesorc     cdouble 5       NULL    YES     double  
NULL    NULL    53      2       NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     double  53      2
-default        default alltypesorc     cstring1        6       NULL    YES     
string  NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     string  NULL    NULL
-default        default alltypesorc     cstring2        7       NULL    YES     
string  NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     string  NULL    NULL
-default        default alltypesorc     ctimestamp1     8       NULL    YES     
timestamp       NULL    NULL    NULL    NULL    NULL    9       NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     timestamp       
NULL    NULL
-default        default alltypesorc     ctimestamp2     9       NULL    YES     
timestamp       NULL    NULL    NULL    NULL    NULL    9       NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     timestamp       
NULL    NULL
-default        default alltypesorc     cboolean1       10      NULL    YES     
boolean NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     boolean NULL    NULL
-default        default alltypesorc     cboolean2       11      NULL    YES     
boolean NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    11      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     boolean NULL    NULL
-default        default moretypes       a       0       NULL    YES     
decimal(10,2)   NULL    NULL    10      10      2       NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    28      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     decimal(10,2)   
10      10
-default        default moretypes       b       1       NULL    YES     tinyint 
NULL    NULL    3       10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    28      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     tinyint 3       10
-default        default moretypes       c       2       NULL    YES     
smallint        NULL    NULL    5       10      NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    28      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     smallint        
5       10
-default        default moretypes       d       3       NULL    YES     int     
NULL    NULL    10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    28      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     int     10      10
-default        default moretypes       e       4       NULL    YES     bigint  
NULL    NULL    19      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    28      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     bigint  19      10
-default        default moretypes       f       5       NULL    YES     
varchar(10)     10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    28      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     varchar(10)     
NULL    NULL
-default        default moretypes       g       6       NULL    YES     char(3) 
3       3       NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    28      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     char(3) NULL    NULL
+default        default alltypesorc     ctinyint        0       NULL    YES     
tinyint NULL    NULL    3       10      NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     tinyint 3       10
+default        default alltypesorc     csmallint       1       NULL    YES     
smallint        NULL    NULL    5       10      NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     smallint        
5       10
+default        default alltypesorc     cint    2       NULL    YES     int     
NULL    NULL    10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     int     10      10
+default        default alltypesorc     cbigint 3       NULL    YES     bigint  
NULL    NULL    19      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     bigint  19      10
+default        default alltypesorc     cfloat  4       NULL    YES     float   
NULL    NULL    23      2       NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     float   23      2
+default        default alltypesorc     cdouble 5       NULL    YES     double  
NULL    NULL    53      2       NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     double  53      2
+default        default alltypesorc     cstring1        6       NULL    YES     
string  NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     string  NULL    NULL
+default        default alltypesorc     cstring2        7       NULL    YES     
string  NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     string  NULL    NULL
+default        default alltypesorc     ctimestamp1     8       NULL    YES     
timestamp       NULL    NULL    NULL    NULL    NULL    9       NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     timestamp       
NULL    NULL
+default        default alltypesorc     ctimestamp2     9       NULL    YES     
timestamp       NULL    NULL    NULL    NULL    NULL    9       NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     timestamp       
NULL    NULL
+default        default alltypesorc     cboolean1       10      NULL    YES     
boolean NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     boolean NULL    NULL
+default        default alltypesorc     cboolean2       11      NULL    YES     
boolean NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    12      NO      NO      NULL    NULL    NULL    NULL    NULL    
NULL    NEVER   NULL    NO      NO      NULL    YES     boolean NULL    NULL
+default        default moretypes       a       0       NULL    YES     
decimal(10,2)   NULL    NULL    10      10      2       NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    16      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     decimal(10,2)   
10      10
+default        default moretypes       b       1       NULL    YES     tinyint 
NULL    NULL    3       10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    16      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     tinyint 3       10
+default        default moretypes       c       2       NULL    YES     
smallint        NULL    NULL    5       10      NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    16      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     smallint        
5       10
+default        default moretypes       d       3       NULL    YES     int     
NULL    NULL    10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    16      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     int     10      10
+default        default moretypes       e       4       NULL    YES     bigint  
NULL    NULL    19      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    16      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     bigint  19      10
+default        default moretypes       f       5       NULL    YES     
varchar(10)     10      10      NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    16      NO      NO      NULL    NULL    NULL    NULL    
NULL    NULL    NEVER   NULL    NO      NO      NULL    YES     varchar(10)     
NULL    NULL
+default        default moretypes       g       6       NULL    YES     char(3) 
3       3       NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    NULL    
NULL    16      NO      NO      NULL    NULL    NULL    NULL    NULL    NULL    
NEVER   NULL    NO      NO      NULL    YES     char(3) NULL    NULL
 PREHOOK: query: select * from COLUMN_PRIVILEGES order by GRANTOR, GRANTEE, 
TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME limit 10
 PREHOOK: type: QUERY
 PREHOOK: Input: information_schema@column_privileges

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out 
b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
index 4f557d3..44788eb 100644
--- a/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_dynpart_hashjoin_3.q.out
@@ -126,7 +126,8 @@ STAGE PLANS:
     Tez
 #### A masked pattern was here ####
       Edges:
-        Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE), Map 3 (BROADCAST_EDGE)
+        Reducer 2 <- Map 1 (CUSTOM_SIMPLE_EDGE)
+        Reducer 3 <- Map 4 (CUSTOM_SIMPLE_EDGE), Reducer 2 (CUSTOM_SIMPLE_EDGE)
 #### A masked pattern was here ####
       Vertices:
         Map 1 
@@ -148,7 +149,7 @@ STAGE PLANS:
                         value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col2 (type: int), _col3 (type: bigint), _col4 (type: float), _col5 
(type: double), _col6 (type: string), _col7 (type: string), _col8 (type: 
timestamp), _col9 (type: timestamp), _col10 (type: boolean), _col11 (type: 
boolean)
             Execution mode: llap
             LLAP IO: all inputs
-        Map 3 
+        Map 4 
             Map Operator Tree:
                 TableScan
                   alias: b
@@ -174,29 +175,39 @@ STAGE PLANS:
                 Limit
                   Number of rows: 1
                   Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
-                  Map Join Operator
-                    condition map:
-                         Left Outer Join 0 to 1
-                    filter predicates:
-                      0 {(_col2 < 100)}
-                      1 
-                    keys:
-                      0 _col2 (type: int)
-                      1 UDFToInteger(_col0) (type: int)
-                    outputColumnNames: _col0, _col1, _col2, _col3, _col4, 
_col5, _col6, _col7, _col8, _col9, _col10, _col11
-                    input vertices:
-                      1 Map 3
+                  Reduce Output Operator
+                    key expressions: _col2 (type: int)
+                    sort order: +
+                    Map-reduce partition columns: _col2 (type: int)
                     Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
-                    Limit
-                      Number of rows: 1
-                      Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
-                      File Output Operator
-                        compressed: false
-                        Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
-                        table:
-                            input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
-                            output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                            serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+                    value expressions: _col0 (type: tinyint), _col1 (type: 
smallint), _col3 (type: bigint), _col4 (type: float), _col5 (type: double), 
_col6 (type: string), _col7 (type: string), _col8 (type: timestamp), _col9 
(type: timestamp), _col10 (type: boolean), _col11 (type: boolean)
+        Reducer 3 
+            Execution mode: llap
+            Reduce Operator Tree:
+              Map Join Operator
+                condition map:
+                     Left Outer Join 0 to 1
+                filter predicates:
+                  0 {(_col2 < 100)}
+                  1 
+                keys:
+                  0 KEY.reducesinkkey0 (type: int)
+                  1 KEY.reducesinkkey0 (type: int)
+                outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, 
_col6, _col7, _col8, _col9, _col10, _col11
+                input vertices:
+                  1 Map 4
+                Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                HybridGraceHashJoin: true
+                Limit
+                  Number of rows: 1
+                  Statistics: Num rows: 1 Data size: 310 Basic stats: COMPLETE 
Column stats: COMPLETE
+                  File Output Operator
+                    compressed: false
+                    Statistics: Num rows: 1 Data size: 310 Basic stats: 
COMPLETE Column stats: COMPLETE
+                    table:
+                        input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
+                        output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                        serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out 
b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
index eee2ab6..8b5f73f 100644
--- a/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_join_result_complex.q.out
@@ -198,6 +198,7 @@ STAGE PLANS:
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   properties:
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes
                     columns.comments 
@@ -222,6 +223,7 @@ STAGE PLANS:
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes
                       columns.comments 
@@ -308,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 
cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes
                     columns.comments 
@@ -332,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 
cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes
                       columns.comments 
@@ -1183,6 +1187,7 @@ STAGE PLANS:
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   properties:
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes
                     columns.comments 
@@ -1207,6 +1212,7 @@ STAGE PLANS:
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
contact_event_id,ce_create_dt,ce_end_dt,contact_type,cnctevs_cd,contact_mode,cntvnst_stts_cd,total_transfers,ce_notes
                       columns.comments 
@@ -1293,6 +1299,7 @@ STAGE PLANS:
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   properties:
                     bucket_count -1
+                    bucketing_version 2
                     column.name.delimiter ,
                     columns 
cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes
                     columns.comments 
@@ -1317,6 +1324,7 @@ STAGE PLANS:
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     properties:
                       bucket_count -1
+                      bucketing_version 2
                       column.name.delimiter ,
                       columns 
cnctevn_id,svcrqst_id,svcrqst_crt_dts,subject_seq_no,plan_component,cust_segment,cnctyp_cd,cnctmd_cd,cnctevs_cd,svcrtyp_cd,svrstyp_cd,cmpltyp_cd,catsrsn_cd,apealvl_cd,cnstnty_cd,svcrqst_asrqst_ind,svcrqst_rtnorig_in,svcrqst_vwasof_dt,sum_reason_cd,sum_reason,crsr_master_claim_index,svcrqct_cds,svcrqst_lupdt,crsr_lupdt,cntevsds_lupdt,ignore_me,notes
                       columns.comments 

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out 
b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
index 0dcca1f..8b95f99 100644
--- a/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_smb_main.q.out
@@ -839,7 +839,7 @@ POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
-19
+9
 PREHOOK: query: explain select count(*) from tab a join tab_part b on a.value 
= b.value
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(*) from tab a join tab_part b on a.value 
= b.value
@@ -1643,7 +1643,7 @@ POSTHOOK: Input: default@tab@ds=2008-04-08
 POSTHOOK: Input: default@tab_part
 POSTHOOK: Input: default@tab_part@ds=2008-04-08
 #### A masked pattern was here ####
-19
+9
 PREHOOK: query: explain
 select count(*) from (select s1.key as key, s1.value as value from tab s1 join 
tab s3 on s1.key=s3.key
 UNION  ALL

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/tez_union2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/tez_union2.q.out 
b/ql/src/test/results/clientpositive/llap/tez_union2.q.out
index 1c8dd11..44bb5d1 100644
--- a/ql/src/test/results/clientpositive/llap/tez_union2.q.out
+++ b/ql/src/test/results/clientpositive/llap/tez_union2.q.out
@@ -204,621 +204,621 @@ group by key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 #### A masked pattern was here ####
-0      val_0
-103    val_103
+0      0
+10     10
 104    104
+104    val_104
 105    105
 105    val_105
-113    113
-116    val_116
-118    118
-12     12
+113    val_113
+118    val_118
+119    119
+12     val_12
 120    val_120
-128    128
-129    val_129
-131    val_131
+129    129
+131    131
+133    val_133
 136    136
 136    val_136
-152    152
-153    153
+145    145
 155    val_155
 157    157
-157    val_157
+158    val_158
 160    val_160
-174    174
+162    162
+162    val_162
+164    164
+165    165
+168    val_168
+17     val_17
+170    val_170
+175    val_175
+177    177
+178    178
+179    179
+18     val_18
 180    val_180
-183    val_183
-190    val_190
-191    val_191
-192    192
-193    val_193
-20     20
-201    201
+186    val_186
+187    187
+189    189
+19     val_19
+190    190
+193    193
+197    val_197
+200    val_200
 202    202
-205    val_205
-207    val_207
-209    209
-213    213
-213    val_213
-216    216
-218    218
-219    219
-221    221
-223    val_223
+208    208
+216    val_216
+218    val_218
+222    val_222
+224    val_224
 228    228
+228    val_228
+230    230
 235    val_235
-238    val_238
+237    237
+237    val_237
 239    val_239
-24     24
-24     val_24
-248    248
-248    val_248
-260    val_260
-262    262
+242    242
+244    val_244
+247    val_247
+256    256
+256    val_256
+260    260
+263    val_263
 265    265
-266    266
-27     27
+273    val_273
 28     val_28
-282    282
+283    val_283
 286    val_286
-289    289
-296    296
-298    val_298
-305    val_305
+292    val_292
+305    305
 306    val_306
-307    val_307
+308    308
 308    val_308
-311    311
-315    val_315
-316    316
 317    317
-317    val_317
-321    321
-321    val_321
-322    322
-33     33
+327    val_327
 33     val_33
-331    val_331
-338    338
-339    339
-34     34
-341    341
-348    348
-356    val_356
-360    val_360
-364    364
+348    val_348
+35     35
+353    val_353
+362    val_362
 366    val_366
-367    val_367
-368    val_368
-37     val_37
-374    374
 377    377
-378    378
-378    val_378
-379    val_379
-382    val_382
-389    389
-389    val_389
+382    382
 392    392
-393    393
-395    val_395
-396    396
-397    397
-400    val_400
-402    val_402
-406    val_406
-407    val_407
-41     41
-414    414
-419    419
-42     val_42
+396    val_396
+397    val_397
+399    399
+401    401
+401    val_401
+403    403
+409    val_409
+411    val_411
+419    val_419
 421    421
-430    val_430
+427    val_427
+43     val_43
+431    431
+432    val_432
 436    val_436
-44     val_44
-448    448
+439    val_439
+443    val_443
+444    444
+446    446
 452    452
-452    val_452
 453    453
+453    val_453
+455    455
+457    457
 460    460
+460    val_460
 462    462
+462    val_462
 463    463
-466    val_466
 467    467
-467    val_467
+47     47
+47     val_47
+470    470
 472    val_472
-478    478
-480    val_480
-481    481
-484    val_484
-485    485
+477    477
+479    479
 485    val_485
-487    val_487
-492    492
+489    489
+491    491
 493    493
 494    494
 495    495
-495    val_495
 496    val_496
-498    val_498
-51     val_51
-57     val_57
-58     58
-58     val_58
-65     val_65
+498    498
+54     val_54
+57     57
+64     val_64
 66     66
-66     val_66
-69     val_69
+70     70
 70     val_70
-78     val_78
 8      val_8
-83     83
-92     92
-92     val_92
-96     96
-96     val_96
+83     val_83
+84     84
+84     val_84
+85     val_85
+90     90
+90     val_90
 97     97
-104    val_104
+0      val_0
+103    val_103
 11     11
-111    111
-111    val_111
-114    114
 114    val_114
-118    val_118
-119    119
-12     val_12
-131    131
-133    val_133
+118    118
+125    val_125
+133    133
 137    137
 138    val_138
-145    145
 146    146
-149    149
-150    150
+146    val_146
+15     15
+150    val_150
+152    152
+152    val_152
 153    val_153
+155    155
+156    156
 156    val_156
+157    val_157
 158    158
-162    162
-162    val_162
-164    164
+160    160
+163    163
+165    val_165
+167    167
 168    168
-168    val_168
-172    172
-174    val_174
+170    170
+172    val_172
 175    175
-176    val_176
-177    177
-178    val_178
+177    val_177
+179    val_179
 18     18
-181    val_181
-186    val_186
-187    187
+181    181
 187    val_187
 191    191
-192    val_192
-194    194
+195    val_195
+196    val_196
 197    197
-197    val_197
-199    val_199
-2      val_2
+199    199
 200    200
-201    val_201
-203    203
-203    val_203
-208    val_208
-214    val_214
-218    val_218
-219    val_219
+201    201
+217    val_217
+219    219
 223    223
 229    229
-230    val_230
-237    val_237
-239    239
-249    val_249
+233    233
+242    val_242
+248    val_248
+249    249
 252    252
-255    255
-256    256
-256    val_256
-257    val_257
-258    258
-26     26
-260    260
-273    273
-274    274
+252    val_252
+257    257
+265    val_265
+266    266
+27     27
+27     val_27
+272    272
+272    val_272
 277    277
-277    val_277
-278    val_278
-28     28
-284    val_284
-285    285
-285    val_285
-286    286
+280    val_280
+291    val_291
 298    298
-305    305
-308    308
+30     30
+305    val_305
 309    309
-310    val_310
+309    val_309
+311    val_311
+315    val_315
+316    316
+317    val_317
+318    318
+322    322
 322    val_322
-325    325
-327    val_327
-331    331
+332    332
+333    333
 333    val_333
 336    336
-336    val_336
-338    val_338
-341    val_341
-342    342
+34     val_34
 344    344
-344    val_344
-348    val_348
-351    val_351
-362    362
-362    val_362
+345    345
+345    val_345
+35     val_35
+356    val_356
 364    val_364
-366    366
-374    val_374
-379    379
-382    382
-384    384
-392    val_392
-397    val_397
-399    399
+367    367
+368    368
+368    val_368
+369    val_369
+37     val_37
+373    val_373
+377    val_377
+378    378
 4      val_4
-403    val_403
+402    val_402
 404    val_404
-406    406
-413    413
-419    val_419
-421    val_421
-424    424
-427    val_427
-429    429
-429    val_429
-43     43
-436    436
+41     41
+411    411
+413    val_413
+417    417
+419    419
+42     val_42
+427    427
+430    val_430
+431    val_431
+432    432
 437    437
-437    val_437
-438    438
-438    val_438
-439    val_439
-444    444
-446    446
+443    443
+444    val_444
+448    448
+449    449
+449    val_449
+452    val_452
+454    454
 454    val_454
-455    455
-455    val_455
+457    val_457
 459    459
-460    val_460
 463    val_463
-468    468
+466    466
+466    val_466
 470    val_470
-477    477
-478    val_478
-479    479
-479    val_479
-480    480
+472    472
+475    val_475
+481    val_481
 482    482
-483    483
+487    487
 489    val_489
 491    val_491
-492    val_492
+492    492
 496    496
-498    498
-53     val_53
-67     67
-67     val_67
-72     72
-74     74
-82     val_82
-85     85
+57     val_57
+65     val_65
+66     val_66
+69     69
+74     val_74
+76     76
+76     val_76
+77     77
+78     val_78
+8      8
+80     80
 9      9
-90     val_90
-95     95
-97     val_97
-10     10
-10     val_10
+9      val_9
+92     val_92
+95     val_95
+100    val_100
+103    103
+113    113
+114    114
 116    116
-120    120
-125    val_125
+119    val_119
+125    125
 126    126
-134    val_134
-143    val_143
+128    128
+128    val_128
+129    val_129
 145    val_145
-149    val_149
-15     15
-150    val_150
-155    155
-158    val_158
-163    val_163
-164    val_164
-166    val_166
-169    169
-17     val_17
-170    val_170
-172    val_172
+149    149
+153    153
+166    166
+167    val_167
+172    172
+174    174
+174    val_174
 176    176
-178    178
-189    189
-189    val_189
+178    val_178
+180    180
+181    val_181
+183    183
+186    186
 19     19
-19     val_19
-193    193
-195    val_195
-196    val_196
-199    199
-2      2
+192    192
+193    val_193
+194    194
+195    195
+196    196
+199    val_199
+20     20
 20     val_20
-205    205
-208    208
-209    val_209
-216    val_216
+201    val_201
+209    209
+213    213
+213    val_213
+214    val_214
+216    216
 217    217
-217    val_217
-222    222
-224    val_224
-226    226
-228    val_228
-229    val_229
-230    230
+218    218
+219    val_219
+221    val_221
+223    val_223
+224    224
+226    val_226
 233    val_233
-237    237
+238    238
+239    239
+24     24
 241    241
 241    val_241
-242    242
 244    244
-244    val_244
 247    247
-247    val_247
-255    val_255
-258    val_258
-26     val_26
-263    263
-263    val_263
-265    val_265
-266    val_266
-272    val_272
-273    val_273
-274    val_274
+248    248
+249    val_249
+26     26
+260    val_260
+262    262
+262    val_262
 275    275
-278    278
+277    val_277
+28     28
 280    280
-281    281
 281    val_281
-284    284
-291    val_291
-296    val_296
-30     30
-30     val_30
+282    282
+283    283
+287    val_287
+288    288
+288    val_288
+298    val_298
 302    val_302
-306    306
-309    val_309
+307    307
 310    310
-316    val_316
-318    318
-318    val_318
-325    val_325
-332    332
-332    val_332
-333    333
-335    val_335
-339    val_339
-342    val_342
-345    val_345
+310    val_310
+311    311
+315    315
+323    323
+323    val_323
+335    335
+336    val_336
+338    338
+34     34
+341    341
+341    val_341
+342    342
+344    val_344
+348    348
 351    351
-353    353
-353    val_353
-360    360
-368    368
-369    369
-369    val_369
-373    val_373
-375    375
+351    val_351
+356    356
+362    362
+364    364
+365    365
+374    374
 375    val_375
-377    val_377
+382    val_382
 384    val_384
 386    386
-386    val_386
-394    val_394
-395    395
-396    val_396
+389    389
+393    393
+393    val_393
+394    394
+395    val_395
 399    val_399
 4      4
-401    401
-401    val_401
-404    404
-407    407
+400    400
+403    val_403
+406    406
+406    val_406
 409    409
-41     val_41
-411    411
-413    val_413
-414    val_414
-417    417
-418    418
-431    val_431
-432    432
-439    439
-443    443
-446    val_446
-448    val_448
-449    val_449
+414    414
+418    val_418
+424    424
+435    val_435
+455    val_455
 458    458
 459    val_459
-462    val_462
-468    val_468
-47     47
-47     val_47
-470    470
-472    472
-475    475
+468    468
+469    469
+477    val_477
+478    478
+478    val_478
+479    val_479
+481    481
 482    val_482
-487    487
-490    val_490
+484    484
+490    490
 493    val_493
 494    val_494
+495    val_495
 497    val_497
 5      val_5
 51     51
 53     53
 54     54
-54     val_54
-57     57
+58     58
+58     val_58
 65     65
-70     70
-74     val_74
-77     val_77
-8      8
-80     val_80
-82     82
-84     84
-84     val_84
-85     val_85
-86     86
+67     val_67
+72     72
+74     74
+77     val_77
+80     val_80
+85     85
+86     val_86
 87     87
-87     val_87
-9      val_9
-90     90
-95     val_95
-0      0
+92     92
+97     val_97
+98     98
+98     val_98
+10     val_10
 100    100
-100    val_100
-103    103
 11     val_11
-113    val_113
-119    val_119
-125    125
+111    111
+111    val_111
+116    val_116
+12     12
+120    120
 126    val_126
-128    val_128
-129    129
-133    133
+131    val_131
 134    134
+134    val_134
 137    val_137
 138    138
 143    143
-146    val_146
+143    val_143
+149    val_149
 15     val_15
-152    val_152
-156    156
-160    160
-163    163
-165    165
-165    val_165
-166    166
-167    167
-167    val_167
+150    150
+163    val_163
+164    val_164
+166    val_166
+169    169
 169    val_169
 17     17
-170    170
-175    val_175
-177    val_177
-179    179
-179    val_179
-18     val_18
-180    180
-181    181
-183    183
-186    186
-190    190
+176    val_176
+183    val_183
+189    val_189
+190    val_190
+191    val_191
+192    val_192
 194    val_194
-195    195
-196    196
-200    val_200
+2      2
+2      val_2
 202    val_202
+203    203
+203    val_203
+205    205
+205    val_205
 207    207
+207    val_207
+208    val_208
+209    val_209
 214    214
-221    val_221
-222    val_222
-224    224
-226    val_226
-233    233
+221    221
+222    222
+226    226
+229    val_229
+230    val_230
 235    235
-238    238
-242    val_242
-249    249
-252    val_252
-257    257
-262    val_262
-27     val_27
-272    272
+238    val_238
+24     val_24
+255    255
+255    val_255
+257    val_257
+258    258
+258    val_258
+26     val_26
+263    263
+266    val_266
+273    273
+274    274
+274    val_274
 275    val_275
-280    val_280
+278    278
+278    val_278
+281    281
 282    val_282
-283    283
-283    val_283
+284    284
+284    val_284
+285    285
+285    val_285
+286    286
 287    287
-287    val_287
-288    288
-288    val_288
+289    289
 289    val_289
 291    291
 292    292
-292    val_292
+296    296
+296    val_296
+30     val_30
 302    302
-307    307
-311    val_311
-315    315
-323    323
-323    val_323
+306    306
+307    val_307
+316    val_316
+318    val_318
+321    321
+321    val_321
+325    325
+325    val_325
 327    327
-335    335
-34     val_34
-345    345
-35     35
-35     val_35
-356    356
-365    365
+33     33
+331    331
+331    val_331
+332    val_332
+335    val_335
+338    val_338
+339    339
+339    val_339
+342    val_342
+353    353
+360    360
+360    val_360
 365    val_365
-367    367
+366    366
+367    val_367
+369    369
 37     37
 373    373
-393    val_393
-394    394
-400    400
+374    val_374
+375    375
+378    val_378
+379    379
+379    val_379
+384    384
+386    val_386
+389    val_389
+392    val_392
+394    val_394
+395    395
+396    396
+397    397
+400    val_400
 402    402
-403    403
-409    val_409
-411    val_411
+404    404
+407    407
+407    val_407
+41     val_41
+413    413
+414    val_414
 417    val_417
-418    val_418
+418    418
 42     42
+421    val_421
 424    val_424
-427    427
-43     val_43
+429    429
+429    val_429
+43     43
 430    430
-431    431
-432    val_432
 435    435
-435    val_435
+436    436
+437    val_437
+438    438
+438    val_438
+439    439
 44     44
-443    val_443
-444    val_444
-449    449
-453    val_453
-454    454
-457    457
-457    val_457
+44     val_44
+446    val_446
+448    val_448
 458    val_458
-466    466
-469    469
+467    val_467
+468    val_468
 469    val_469
-475    val_475
-477    val_477
-481    val_481
+475    475
+480    480
+480    val_480
+483    483
 483    val_483
-484    484
-489    489
-490    490
-491    491
+484    val_484
+485    485
+487    val_487
+490    val_490
+492    val_492
 497    497
+498    val_498
 5      5
+51     val_51
+53     val_53
 64     64
-64     val_64
-69     69
+67     67
+69     val_69
 72     val_72
-76     76
-76     val_76
-77     77
 78     78
-80     80
-83     val_83
-86     val_86
-98     98
-98     val_98
+82     82
+82     val_82
+83     83
+86     86
+87     val_87
+95     95
+96     96
+96     val_96

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
index d0a5e62..c8bec43 100644
--- 
a/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
+++ 
b/ql/src/test/results/clientpositive/llap/tez_vector_dynpart_hashjoin_1.q.out
@@ -404,10 +404,10 @@ order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
--8915  1
+-13036 1
 -3799  1
 10782  1
--13036 1
+-8915  1
 NULL   6
 PREHOOK: query: explain
 select
@@ -824,8 +824,8 @@ order by c1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypesorc
 #### A masked pattern was here ####
+-13036 1
 -8915  1
 -3799  1
 10782  1
--13036 1
 NULL   6

http://git-wip-us.apache.org/repos/asf/hive/blob/091fd962/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out 
b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
index 3b6e2bd..4d6a684 100644
--- a/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
+++ b/ql/src/test/results/clientpositive/llap/udaf_collect_set_2.q.out
@@ -103,8 +103,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}]
-2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
+2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -122,8 +122,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2013-06-21","amount":21.45},{"name":"Chris","date":"2014-10-11","amount":29.36}]
-2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210.03}]
+2      
[{"name":"John","date":"2013-08-10","amount":126.57},{"name":"John","date":"2014-06-25","amount":3.65},{"name":"John","date":"2015-01-15","amount":27.45}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -141,8 +141,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
-2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
+2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "amount", cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -160,8 +160,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2013-06-21","amount":21.5},{"name":"Chris","date":"2014-10-11","amount":29.4}]
-2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 3      
[{"name":"Martin","date":"2014-05-11","amount":30.5},{"name":"Martin","date":"2014-12-12","amount":210}]
+2      
[{"name":"John","date":"2013-08-10","amount":126.6},{"name":"John","date":"2014-06-25","amount":3.7},{"name":"John","date":"2015-01-15","amount":27.5}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -179,8 +179,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -198,8 +198,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2013-06-21","col3":21.45},{"col1":"Chris","col2":"2014-10-11","col3":29.36}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":30.5},{"col1":"Martin","col2":"2014-12-12","col3":210.03}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":126.57},{"col1":"John","col2":"2014-06-25","col3":3.65},{"col1":"John","col2":"2015-01-15","col3":27.45}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -217,8 +217,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -236,8 +236,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2013-06-21","sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"name":"Chris","date":"2014-10-11","sub":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"name":"Martin","date":"2014-12-12","sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"name":"John","date":"2013-08-10","sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"name":"John","date":"2014-06-25","sub":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"name":"John","date":"2015-01-15","sub":{"\"milk\"":27.45}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -255,8 +255,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -274,8 +274,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2013-06-21","col3":{"\"juice\"":21.45,"\"bread\"":15.2}},{"col1":"Chris","col2":"2014-10-11","col3":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":{"\"apple\"":30.5,"\"orange\"":41.35}},{"col1":"Martin","col2":"2014-12-12","col3":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"col1":"John","col2":"2014-06-25","col3":{"\"chocolate\"":3.65,"\"water\"":420.36}},{"col1":"John","col2":"2015-01-15","col3":{"\"milk\"":27.45}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -293,8 +293,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[29.36,1200.5]}]
-2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
+2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(named_struct("name", 
c.name, "date", o.d, "sub", map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -312,8 +312,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2013-06-21","sub":[21.45,15.2]},{"name":"Chris","date":"2014-10-11","sub":[29.36,1200.5]}]
-2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 3      
[{"name":"Martin","date":"2014-05-11","sub":[30.5,41.35]},{"name":"Martin","date":"2014-12-12","sub":[210.03,100.56,500.0]}]
+2      
[{"name":"John","date":"2013-08-10","sub":[126.57,210.57]},{"name":"John","date":"2014-06-25","sub":[3.65,420.36]},{"name":"John","date":"2015-01-15","sub":[27.45]}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -331,8 +331,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[29.36,1200.5]}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(struct(c.name, o.d, 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -350,8 +350,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2013-06-21","col3":[21.45,15.2]},{"col1":"Chris","col2":"2014-10-11","col3":[29.36,1200.5]}]
-2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 3      
[{"col1":"Martin","col2":"2014-05-11","col3":[30.5,41.35]},{"col1":"Martin","col2":"2014-12-12","col3":[210.03,100.56,500.0]}]
+2      
[{"col1":"John","col2":"2013-08-10","col3":[126.57,210.57]},{"col1":"John","col2":"2014-06-25","col3":[3.65,420.36]},{"col1":"John","col2":"2015-01-15","col3":[27.45]}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -369,8 +369,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [[21.45],[29.36]]
-2      [[3.65],[27.45],[126.57]]
 3      [[30.5],[210.03]]
+2      [[3.65],[27.45],[126.57]]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(array(o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -388,8 +388,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [[21.45],[21.45],[29.36]]
-2      [[3.65],[27.45],[126.57]]
 3      [[30.5],[210.03]]
+2      [[3.65],[27.45],[126.57]]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(array(cast(o.amount as 
decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -407,8 +407,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [[21.5],[29.4]]
-2      [[3.7],[27.5],[126.6]]
 3      [[30.5],[210]]
+2      [[3.7],[27.5],[126.6]]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(array(cast(o.amount as 
decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -426,8 +426,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [[21.5],[21.5],[29.4]]
-2      [[3.7],[27.5],[126.6]]
 3      [[30.5],[210]]
+2      [[3.7],[27.5],[126.6]]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(array(o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -445,8 +445,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"rice\"":29.36,"\"grape\"":1200.5}]]
-2      
[[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]]
 3      
[[{"\"apple\"":30.5,"\"orange\"":41.35}],[{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}]]
+2      
[[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(array(o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -464,8 +464,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"juice\"":21.45,"\"bread\"":15.2}],[{"\"rice\"":29.36,"\"grape\"":1200.5}]]
-2      
[[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]]
 3      
[[{"\"apple\"":30.5,"\"orange\"":41.35}],[{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}]]
+2      
[[{"\"milk\"":27.45}],[{"\"yogurt\"":126.57,"\"beef\"":210.57}],[{"\"chocolate\"":3.65,"\"water\"":420.36}]]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(array(map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -483,8 +483,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      [[[21.45,15.2]],[[29.36,1200.5]]]
-2      [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]]
 3      [[[30.5,41.35]],[[210.03,100.56,500.0]]]
+2      [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(array(map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -502,8 +502,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      [[[21.45,15.2]],[[21.45,15.2]],[[29.36,1200.5]]]
-2      [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]]
 3      [[[30.5,41.35]],[[210.03,100.56,500.0]]]
+2      [[[3.65,420.36]],[[27.45]],[[126.57,210.57]]]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -521,8 +521,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [{"amount":21.45},{"amount":29.36}]
-2      [{"amount":3.65},{"amount":27.45},{"amount":126.57}]
 3      [{"amount":30.5},{"amount":210.03}]
+2      [{"amount":3.65},{"amount":27.45},{"amount":126.57}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(map("amount", o.amount)))
 FROM customers c
 INNER JOIN orders o
@@ -540,8 +540,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [{"amount":21.45},{"amount":21.45},{"amount":29.36}]
-2      [{"amount":3.65},{"amount":27.45},{"amount":126.57}]
 3      [{"amount":30.5},{"amount":210.03}]
+2      [{"amount":3.65},{"amount":27.45},{"amount":126.57}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(map("amount", 
cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -559,8 +559,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [{"amount":21.5},{"amount":29.4}]
-2      [{"amount":3.7},{"amount":27.5},{"amount":126.6}]
 3      [{"amount":30.5},{"amount":210}]
+2      [{"amount":3.7},{"amount":27.5},{"amount":126.6}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(map("amount", 
cast(o.amount as decimal(10,1)))))
 FROM customers c
 INNER JOIN orders o
@@ -578,8 +578,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@orders
 #### A masked pattern was here ####
 1      [{"amount":21.5},{"amount":21.5},{"amount":29.4}]
-2      [{"amount":3.7},{"amount":27.5},{"amount":126.6}]
 3      [{"amount":30.5},{"amount":210}]
+2      [{"amount":3.7},{"amount":27.5},{"amount":126.6}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -597,8 +597,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}]
 3      
[{"sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(map("sub", o.sub)))
 FROM customers c
 INNER JOIN nested_orders o
@@ -616,8 +616,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      
[{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"juice\"":21.45,"\"bread\"":15.2}},{"sub":{"\"rice\"":29.36,"\"grape\"":1200.5}}]
-2      
[{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}]
 3      
[{"sub":{"\"apple\"":30.5,"\"orange\"":41.35}},{"sub":{"\"icecream\"":210.03,"\"banana\"":100.56,"\"coffee":500.0}}]
+2      
[{"sub":{"\"milk\"":27.45}},{"sub":{"\"yogurt\"":126.57,"\"beef\"":210.57}},{"sub":{"\"chocolate\"":3.65,"\"water\"":420.36}}]
 PREHOOK: query: SELECT c.id, sort_array(collect_set(map("sub", 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -635,8 +635,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      [{"sub":[21.45,15.2]},{"sub":[29.36,1200.5]}]
-2      [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}]
 3      [{"sub":[30.5,41.35]},{"sub":[210.03,100.56,500.0]}]
+2      [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}]
 PREHOOK: query: SELECT c.id, sort_array(collect_list(map("sub", 
map_values(o.sub))))
 FROM customers c
 INNER JOIN nested_orders o
@@ -654,8 +654,8 @@ POSTHOOK: Input: default@customers
 POSTHOOK: Input: default@nested_orders
 #### A masked pattern was here ####
 1      [{"sub":[21.45,15.2]},{"sub":[21.45,15.2]},{"sub":[29.36,1200.5]}]
-2      [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}]
 3      [{"sub":[30.5,41.35]},{"sub":[210.03,100.56,500.0]}]
+2      [{"sub":[3.65,420.36]},{"sub":[27.45]},{"sub":[126.57,210.57]}]
 PREHOOK: query: DROP TABLE customer
 PREHOOK: type: DROPTABLE
 POSTHOOK: query: DROP TABLE customer

Reply via email to