Test fixes for lineage3.q and load_static_ptn_into_bucketed_table.q (Naveen Gangam)
diff --git a/ql/src/test/results/clientpositive/llap/lineage3.q.out b/ql/src/test/results/clientpositive/llap/lineage3.q.out
index ccc5031..d14e33c 100644
--- a/ql/src/test/results/clientpositive/llap/lineage3.q.out
+++ b/ql/src/test/results/clientpositive/llap/lineage3.q.out
@@ -244,6 +244,7 @@
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_v1
+#### A masked pattern was here ####
 {"version":"1.0","engine":"tez","database":"default","hash":"c2911fa522080c74d718d7dbc016809d","queryText":"alter view dest_v1 as select ctinyint from alltypesorc","edges":[{"sources":[1],"targets":[0],"edgeType":"PROJECTION"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v1.ctinyint"},{"id":1,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"}]}
 PREHOOK: query: select t.ctinyint from (select * from dest_v1 where ctinyint is not null) t
 where ctinyint > 10 order by ctinyint limit 2
@@ -311,6 +312,7 @@
 PREHOOK: Input: default@alltypesorc
 PREHOOK: Output: database:default
 PREHOOK: Output: default@dest_v3
+#### A masked pattern was here ####
 {"version":"1.0","engine":"tez","database":"default","hash":"81bb549360513aeae39a3bd971405be3","queryText":"alter view dest_v3 as\n  select * from (\n    select sum(a.ctinyint) over (partition by a.csmallint order by a.csmallint) a,\n      count(b.cstring1) x, b.cboolean1\n    from alltypesorc a join alltypesorc b on (a.cint = b.cint)\n    where a.cboolean2 = true and b.cfloat > 0\n    group by a.ctinyint, a.csmallint, b.cboolean1\n    having count(a.cint) > 10\n    order by a, x, b.cboolean1 limit 10) t_n20","edges":[{"sources":[3,4,5,6,7],"targets":[0],"expression":"(tok_function sum (. (tok_table_or_col a) ctinyint) (tok_windowspec (tok_partitioningspec (tok_distributeby (. (tok_table_or_col a) csmallint)) (tok_orderby (tok_tabsortcolnameasc (tok_nulls_first (. (tok_table_or_col a) csmallint)))))))","edgeType":"PROJECTION"},{"sources":[6],"targets":[1],"expression":"count(default.alltypesorc.cstring1)","edgeType":"PROJECTION"},{"sources":[5],"targets":[2],"edgeType":"PROJECTION"},{"sources":[7],"targets":[0,1,2],"expression":"(a.cint = b.cint)","edgeType":"PREDICATE"},{"sources":[8,9],"targets":[0,1,2],"expression":"((a.cboolean2 = true) and (b.cfloat > 0.0))","edgeType":"PREDICATE"},{"sources":[7],"targets":[0,1,2],"expression":"(count(default.alltypesorc.cint) > 10L)","edgeType":"PREDICATE"}],"vertices":[{"id":0,"vertexType":"COLUMN","vertexId":"default.dest_v3.a"},{"id":1,"vertexType":"COLUMN","vertexId":"default.dest_v3.x"},{"id":2,"vertexType":"COLUMN","vertexId":"default.dest_v3.cboolean1"},{"id":3,"vertexType":"COLUMN","vertexId":"default.alltypesorc.ctinyint"},{"id":4,"vertexType":"COLUMN","vertexId":"default.alltypesorc.csmallint"},{"id":5,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean1"},{"id":6,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cstring1"},{"id":7,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cint"},{"id":8,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cboolean2"},{"id":9,"vertexType":"COLUMN","vertexId":"default.alltypesorc.cfloat"}]}
 PREHOOK: query: select * from dest_v3 limit 2
 PREHOOK: type: QUERY
diff --git a/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out b/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
index d646077..c5558a7 100644
--- a/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
+++ b/ql/src/test/results/clientpositive/load_static_ptn_into_bucketed_table.q.out
@@ -25,25 +25,25 @@
       Map Operator Tree:
           TableScan
             alias: src_bucket_tbl__temp_table_for_load_data__
-            Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: _col0 (type: int)
-                Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: int), _col1 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -238,25 +238,25 @@
       Map Operator Tree:
           TableScan
             alias: src_bucket_tbl__temp_table_for_load_data__
-            Statistics: Num rows: 35 Data size: 13020 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 35 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 35 Data size: 13020 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 35 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
-                key expressions: _col2 (type: string), _bucket_number (type: string)
-                sort order: ++
-                Map-reduce partition columns: _col2 (type: string)
-                value expressions: _col0 (type: int), _col1 (type: string)
+                sort order: 
+                Map-reduce partition columns: _col0 (type: int)
+                Statistics: Num rows: 35 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
-          outputColumnNames: _col0, _col1, _col2, _bucket_number
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 35 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Dp Sort State: PARTITION_BUCKET_SORTED
-            Statistics: Num rows: 35 Data size: 13020 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 35 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -452,25 +452,25 @@
       Map Operator Tree:
           TableScan
             alias: src_bucket_tbl__temp_table_for_load_data__
-            Statistics: Num rows: 68 Data size: 24552 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 68 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string), ds (type: string)
               outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 68 Data size: 24552 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 68 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
-                key expressions: _col2 (type: string), _bucket_number (type: string)
-                sort order: ++
-                Map-reduce partition columns: _col2 (type: string)
-                value expressions: _col0 (type: int), _col1 (type: string)
+                sort order: 
+                Map-reduce partition columns: _col0 (type: int)
+                Statistics: Num rows: 68 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
+                value expressions: _col0 (type: int), _col1 (type: string), _col2 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
-          expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), KEY._col2 (type: string), KEY._bucket_number (type: string)
-          outputColumnNames: _col0, _col1, _col2, _bucket_number
+          expressions: VALUE._col0 (type: int), VALUE._col1 (type: string), VALUE._col2 (type: string)
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 68 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Dp Sort State: PARTITION_BUCKET_SORTED
-            Statistics: Num rows: 68 Data size: 24552 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 68 Data size: 26560 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -667,25 +667,25 @@
       Map Operator Tree:
           TableScan
             alias: src_bucket_tbl__temp_table_for_load_data__
-            Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 sort order: 
                 Map-reduce partition columns: _col0 (type: int)
-                Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col0 (type: int), _col1 (type: string)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
           expressions: VALUE._col0 (type: int), VALUE._col1 (type: string)
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 47 Data size: 8648 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 47 Data size: 13580 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat