Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/vectorized_ptf.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/vectorized_ptf.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/vectorized_ptf.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/vectorized_ptf.q.out 
Fri Jan 23 19:59:11 2015
@@ -263,7 +263,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -283,7 +283,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -329,7 +329,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -358,7 +358,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -609,7 +611,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -629,7 +631,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -742,7 +744,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -771,7 +773,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
@@ -942,7 +946,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -962,7 +966,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -1193,7 +1197,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -1213,7 +1217,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -1259,7 +1263,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -1288,7 +1292,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -1522,7 +1528,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -1542,7 +1548,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -1588,7 +1594,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -1617,7 +1623,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -1861,7 +1869,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -1881,7 +1889,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -1994,7 +2002,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: int)
+              value expressions: _col2 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -2023,7 +2031,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 
(type: string), VALUE._col0 (type: int)
+          outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
@@ -2212,7 +2222,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -2232,7 +2242,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -2341,7 +2351,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -2361,7 +2371,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -2559,7 +2569,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -2579,7 +2589,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -2688,7 +2698,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -2708,7 +2718,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -2917,7 +2927,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -2937,7 +2947,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -2983,7 +2993,6 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -3012,7 +3021,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), KEY.reducesinkkey2 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -3235,7 +3246,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -3255,7 +3266,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -3301,7 +3312,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -3330,7 +3341,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -3555,7 +3568,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -3575,7 +3588,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -3621,7 +3634,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -3650,7 +3663,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -3885,7 +3900,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -3905,7 +3920,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -4015,7 +4030,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -4044,7 +4059,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -4299,7 +4316,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -4319,7 +4336,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -4365,7 +4382,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -4394,7 +4411,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -4726,7 +4745,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -4746,7 +4765,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -4855,7 +4874,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -4875,7 +4894,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -4922,7 +4941,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -4951,7 +4970,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 14 Data size: 8823 Basic stats: COMPLETE 
Column stats: NONE
@@ -5133,7 +5154,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -5153,7 +5174,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -5455,7 +5476,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -5475,7 +5496,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -5582,7 +5603,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col0 (type: string)
               Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col0 (type: string), _col1 (type: string), 
_col2 (type: double)
+              value expressions: _col2 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -5611,7 +5632,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: string), KEY.reducesinkkey1 
(type: string), VALUE._col0 (type: double)
+          outputColumnNames: _col0, _col1, _col2
           Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 13 Data size: 8021 Basic stats: COMPLETE 
Column stats: NONE
@@ -6002,7 +6025,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -6022,7 +6045,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -6085,7 +6108,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col1 (type: string)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -6114,7 +6137,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col1 (type: string), KEY.reducesinkkey0 (type: 
string), KEY.reducesinkkey1 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -6147,7 +6172,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _wcol0 (type: bigint), _col1 (type: string), 
_col2 (type: string), _col5 (type: int)
+              value expressions: _wcol0 (type: bigint), _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -6176,7 +6201,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: VALUE._col0 (type: bigint), KEY.reducesinkkey2 (type: 
string), KEY.reducesinkkey0 (type: string), VALUE._col4 (type: int)
+          outputColumnNames: _col0, _col2, _col3, _col6
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -6248,7 +6275,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int), _col7 (type: double)
+              value expressions: _col5 (type: int), _col7 (type: double)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -6277,7 +6304,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int), VALUE._col5 (type: double)
+          outputColumnNames: _col1, _col2, _col5, _col7
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -6642,7 +6671,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -6662,7 +6691,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -6772,7 +6801,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string), _col1 (type: 
string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -6801,7 +6830,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -7087,7 +7118,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -7107,7 +7138,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -7277,7 +7308,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -7306,7 +7337,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -7575,7 +7608,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -7595,7 +7628,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -7703,7 +7736,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -7732,7 +7765,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -8013,7 +8048,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -8033,7 +8068,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -8205,7 +8240,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string), _col1 (type: 
string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -8234,7 +8269,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -8546,7 +8583,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -8566,7 +8603,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -8676,7 +8713,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string), _col1 (type: 
string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -8705,7 +8742,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
@@ -8983,7 +9022,7 @@ STAGE PLANS:
               serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-              totalSize 2599
+              totalSize 2639
 #### A masked pattern was here ####
             serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
           
@@ -9003,7 +9042,7 @@ STAGE PLANS:
                 serialization.ddl struct part_orc { i32 p_partkey, string 
p_name, string p_mfgr, string p_brand, string p_type, i32 p_size, string 
p_container, double p_retailprice, string p_comment}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.ql.io.orc.OrcSerde
-                totalSize 2599
+                totalSize 2639
 #### A masked pattern was here ####
               serde: org.apache.hadoop.hive.ql.io.orc.OrcSerde
               name: default.part_orc
@@ -9113,7 +9152,7 @@ STAGE PLANS:
               Map-reduce partition columns: _col2 (type: string)
               Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
               tag: -1
-              value expressions: _col1 (type: string), _col2 (type: string), 
_col5 (type: int)
+              value expressions: _col5 (type: int)
               auto parallelism: false
       Path -> Alias:
 #### A masked pattern was here ####
@@ -9142,7 +9181,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
       Needs Tagging: false
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string), VALUE._col3 (type: int)
+          outputColumnNames: _col1, _col2, _col5
           Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 16042 Basic stats: COMPLETE 
Column stats: NONE

Modified: hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out 
(original)
+++ hive/branches/llap/ql/src/test/results/clientpositive/windowing.q.out Fri 
Jan 23 19:59:11 2015
@@ -1,4 +1,6 @@
-PREHOOK: query: -- 1. testWindowing
+PREHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. testWindowing
 select p_mfgr, p_name, p_size,
 rank() over(distribute by p_mfgr sort by p_name) as r,
 dense_rank() over(distribute by p_mfgr sort by p_name) as dr,
@@ -7,7 +9,9 @@ from part
 PREHOOK: type: QUERY
 PREHOOK: Input: default@part
 #### A masked pattern was here ####
-POSTHOOK: query: -- 1. testWindowing
+POSTHOOK: query: -- SORT_QUERY_RESULTS
+
+-- 1. testWindowing
 select p_mfgr, p_name, p_size,
 rank() over(distribute by p_mfgr sort by p_name) as r,
 dense_rank() over(distribute by p_mfgr sort by p_name) as dr,
@@ -250,32 +254,32 @@ from part
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+1      1       1       1620.67 0
+1      1       1       1671.68 0
+1      1       1       1690.68 0
+1      1       1       1789.69 0
 1      1       2       1173.15 0
 1      1       2       2346.3  0
-3      2       3       4100.06 32
-4      3       4       5702.650000000001       -28
-5      4       5       7117.070000000001       22
-6      5       6       8749.730000000001       14
-1      1       1       1690.68 0
-2      2       2       3491.38 26
-3      3       3       5523.360000000001       -38
-4      4       4       7222.02 23
-5      5       5       8923.62 -7
-1      1       1       1671.68 0
 2      2       2       2861.95 -3
-3      3       3       4272.34 5
-4      4       4       6195.32 -18
-5      5       5       7532.61 44
-1      1       1       1620.67 0
 2      2       2       2996.09 29
-3      3       3       4202.35 -12
-4      4       4       6047.27 -20
-5      5       5       7337.620000000001       5
-1      1       1       1789.69 0
 2      2       2       3401.3500000000004      -25
+2      2       2       3491.38 26
+3      2       3       4100.06 32
+3      3       3       4202.35 -12
+3      3       3       4272.34 5
 3      3       3       5190.08 -4
+3      3       3       5523.360000000001       -38
+4      3       4       5702.650000000001       -28
+4      4       4       6047.27 -20
+4      4       4       6195.32 -18
 4      4       4       6208.18 44
+4      4       4       7222.02 23
+5      4       5       7117.070000000001       22
+5      5       5       7337.620000000001       5
+5      5       5       7532.61 44
 5      5       5       7672.66 -23
+5      5       5       8923.62 -7
+6      5       6       8749.730000000001       14
 PREHOOK: query: -- 7. testJoinWithWindowingAndPTF
 select abc.p_mfgr, abc.p_name, 
 rank() over(distribute by abc.p_mfgr sort by abc.p_name) as r, 
@@ -902,8 +906,8 @@ window w1 as (distribute by p_mfgr sort
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#1 almond antique burnished rose metallic  2       
273.70217881648074      273.70217881648074      [2,34]  74912.8826888888        
1.0     4128.782222222221
 Manufacturer#1 almond antique burnished rose metallic  2       
258.10677784349235      258.10677784349235      [2,34,6]        
66619.10876874991       0.811328754177887       2801.7074999999995
+Manufacturer#1 almond antique burnished rose metallic  2       
273.70217881648074      273.70217881648074      [2,34]  74912.8826888888        
1.0     4128.782222222221
 Manufacturer#1 almond antique chartreuse lavender yellow       34      
230.90151585470358      230.90151585470358      [2,34,6,28]     
53315.51002399992       0.695639377397664       2210.7864
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       
202.73109328368946      202.73109328368946      [2,34,6,28,42]  41099.896184    
0.630785977101214       2009.9536000000007
 Manufacturer#1 almond aquamarine burnished black steel 28      
121.6064517973862       121.6064517973862       [34,6,28,42]    
14788.129118750014      0.2036684720435979      331.1337500000004
@@ -948,8 +952,8 @@ window w1 as (distribute by p_mfgr sort
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#1 almond antique burnished rose metallic  2       
[{"x":1173.15,"y":2.0},{"x":1753.76,"y":1.0}]   121152.0        1
 Manufacturer#1 almond antique burnished rose metallic  2       
[{"x":1173.15,"y":2.0},{"x":1602.59,"y":1.0},{"x":1753.76,"y":1.0}]     
115872.0        2
+Manufacturer#1 almond antique burnished rose metallic  2       
[{"x":1173.15,"y":2.0},{"x":1753.76,"y":1.0}]   121152.0        1
 Manufacturer#1 almond antique chartreuse lavender yellow       34      
[{"x":1173.15,"y":2.0},{"x":1414.42,"y":1.0},{"x":1602.59,"y":1.0},{"x":1753.76,"y":1.0}]
       110592.0        3
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       
[{"x":1173.15,"y":1.0},{"x":1414.42,"y":1.0},{"x":1602.59,"y":1.0},{"x":1632.66,"y":1.0},{"x":1753.76,"y":1.0}]
 86428.0 4
 Manufacturer#1 almond aquamarine burnished black steel 28      
[{"x":1414.42,"y":1.0},{"x":1602.59,"y":1.0},{"x":1632.66,"y":1.0},{"x":1753.76,"y":1.0}]
       86098.0 5
@@ -1096,32 +1100,32 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@mfgr_brand_price_view
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+Manufacturer#1 Brand#12        4100.06
+Manufacturer#1 Brand#12        4649.670000000001
+Manufacturer#1 Brand#12        4770.77
 Manufacturer#1 Brand#14        1173.15
 Manufacturer#1 Brand#14        2346.3
-Manufacturer#1 Brand#12        4100.06
 Manufacturer#1 Brand#15        4529.5
-Manufacturer#1 Brand#12        4770.77
-Manufacturer#1 Brand#12        4649.670000000001
 Manufacturer#2 Brand#22        1690.68
 Manufacturer#2 Brand#22        3491.38
 Manufacturer#2 Brand#23        5523.360000000001
 Manufacturer#2 Brand#24        5531.34
 Manufacturer#2 Brand#25        5432.240000000001
 Manufacturer#3 Brand#31        1671.68
-Manufacturer#3 Brand#35        2861.95
 Manufacturer#3 Brand#32        4272.34
 Manufacturer#3 Brand#32        4523.639999999999
 Manufacturer#3 Brand#34        4670.66
+Manufacturer#3 Brand#35        2861.95
 Manufacturer#4 Brand#41        1620.67
+Manufacturer#4 Brand#41        4341.530000000001
+Manufacturer#4 Brand#41        4426.6
 Manufacturer#4 Brand#42        2996.09
 Manufacturer#4 Brand#42        4202.35
-Manufacturer#4 Brand#41        4426.6
-Manufacturer#4 Brand#41        4341.530000000001
-Manufacturer#5 Brand#52        1789.69
 Manufacturer#5 Brand#51        3401.3500000000004
-Manufacturer#5 Brand#53        5190.08
-Manufacturer#5 Brand#53        4418.49
+Manufacturer#5 Brand#52        1789.69
 Manufacturer#5 Brand#52        4271.3099999999995
+Manufacturer#5 Brand#53        4418.49
+Manufacturer#5 Brand#53        5190.08
 PREHOOK: query: -- 24. testLateralViews
 select p_mfgr, p_name, 
 lv_col, p_size, sum(p_size) over w1   as s
@@ -1146,78 +1150,78 @@ Manufacturer#1  almond antique burnished
 Manufacturer#1 almond antique burnished rose metallic  2       2       6
 Manufacturer#1 almond antique burnished rose metallic  3       2       6
 Manufacturer#1 almond antique burnished rose metallic  3       2       6
+Manufacturer#1 almond antique chartreuse lavender yellow       1       34      
90
+Manufacturer#1 almond antique chartreuse lavender yellow       2       34      
96
+Manufacturer#1 almond antique chartreuse lavender yellow       3       34      
102
 Manufacturer#1 almond antique salmon chartreuse burlywood      1       6       
10
 Manufacturer#1 almond antique salmon chartreuse burlywood      2       6       
14
 Manufacturer#1 almond antique salmon chartreuse burlywood      3       6       
18
 Manufacturer#1 almond aquamarine burnished black steel 1       28      40
 Manufacturer#1 almond aquamarine burnished black steel 2       28      62
 Manufacturer#1 almond aquamarine burnished black steel 3       28      84
-Manufacturer#1 almond antique chartreuse lavender yellow       1       34      
90
-Manufacturer#1 almond antique chartreuse lavender yellow       2       34      
96
-Manufacturer#1 almond antique chartreuse lavender yellow       3       34      
102
 Manufacturer#1 almond aquamarine pink moccasin thistle 1       42      110
 Manufacturer#1 almond aquamarine pink moccasin thistle 2       42      118
 Manufacturer#1 almond aquamarine pink moccasin thistle 3       42      126
-Manufacturer#2 almond aquamarine midnight light salmon 1       2       2
-Manufacturer#2 almond aquamarine midnight light salmon 2       2       4
-Manufacturer#2 almond aquamarine midnight light salmon 3       2       6
 Manufacturer#2 almond antique violet chocolate turquoise       1       14      
18
 Manufacturer#2 almond antique violet chocolate turquoise       2       14      
30
 Manufacturer#2 almond antique violet chocolate turquoise       3       14      
42
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  1       18      46
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  2       18      50
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  3       18      54
-Manufacturer#2 almond aquamarine rose maroon antique   1       25      61
-Manufacturer#2 almond aquamarine rose maroon antique   2       25      68
-Manufacturer#2 almond aquamarine rose maroon antique   3       25      75
 Manufacturer#2 almond antique violet turquoise frosted 1       40      90
 Manufacturer#2 almond antique violet turquoise frosted 2       40      105
 Manufacturer#2 almond antique violet turquoise frosted 3       40      120
-Manufacturer#3 almond antique misty red olive  1       1       1
-Manufacturer#3 almond antique misty red olive  2       1       2
-Manufacturer#3 almond antique misty red olive  3       1       3
-Manufacturer#3 almond antique forest lavender goldenrod        1       14      
16
-Manufacturer#3 almond antique forest lavender goldenrod        2       14      
29
-Manufacturer#3 almond antique forest lavender goldenrod        3       14      
42
+Manufacturer#2 almond aquamarine midnight light salmon 1       2       2
+Manufacturer#2 almond aquamarine midnight light salmon 2       2       4
+Manufacturer#2 almond aquamarine midnight light salmon 3       2       6
+Manufacturer#2 almond aquamarine rose maroon antique   1       25      61
+Manufacturer#2 almond aquamarine rose maroon antique   2       25      68
+Manufacturer#2 almond aquamarine rose maroon antique   3       25      75
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  1       18      46
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  2       18      50
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  3       18      54
 Manufacturer#3 almond antique chartreuse khaki white   1       17      45
 Manufacturer#3 almond antique chartreuse khaki white   2       17      48
 Manufacturer#3 almond antique chartreuse khaki white   3       17      51
+Manufacturer#3 almond antique forest lavender goldenrod        1       14      
16
+Manufacturer#3 almond antique forest lavender goldenrod        2       14      
29
+Manufacturer#3 almond antique forest lavender goldenrod        3       14      
42
 Manufacturer#3 almond antique metallic orange dim      1       19      53
 Manufacturer#3 almond antique metallic orange dim      2       19      55
 Manufacturer#3 almond antique metallic orange dim      3       19      57
+Manufacturer#3 almond antique misty red olive  1       1       1
+Manufacturer#3 almond antique misty red olive  2       1       2
+Manufacturer#3 almond antique misty red olive  3       1       3
 Manufacturer#3 almond antique olive coral navajo       1       45      83
 Manufacturer#3 almond antique olive coral navajo       2       45      109
 Manufacturer#3 almond antique olive coral navajo       3       45      135
-Manufacturer#4 almond aquamarine yellow dodger mint    1       7       7
-Manufacturer#4 almond aquamarine yellow dodger mint    2       7       14
-Manufacturer#4 almond aquamarine yellow dodger mint    3       7       21
 Manufacturer#4 almond antique gainsboro frosted violet 1       10      24
 Manufacturer#4 almond antique gainsboro frosted violet 2       10      27
 Manufacturer#4 almond antique gainsboro frosted violet 3       10      30
-Manufacturer#4 almond azure aquamarine papaya violet   1       12      32
-Manufacturer#4 almond azure aquamarine papaya violet   2       12      34
-Manufacturer#4 almond azure aquamarine papaya violet   3       12      36
-Manufacturer#4 almond aquamarine floral ivory bisque   1       27      51
-Manufacturer#4 almond aquamarine floral ivory bisque   2       27      66
-Manufacturer#4 almond aquamarine floral ivory bisque   3       27      81
 Manufacturer#4 almond antique violet mint lemon        1       39      93
 Manufacturer#4 almond antique violet mint lemon        2       39      105
 Manufacturer#4 almond antique violet mint lemon        3       39      117
-Manufacturer#5 almond antique sky peru orange  1       2       2
-Manufacturer#5 almond antique sky peru orange  2       2       4
-Manufacturer#5 almond antique sky peru orange  3       2       6
-Manufacturer#5 almond antique medium spring khaki      1       6       10
-Manufacturer#5 almond antique medium spring khaki      2       6       14
-Manufacturer#5 almond antique medium spring khaki      3       6       18
-Manufacturer#5 almond azure blanched chiffon midnight  1       23      35
-Manufacturer#5 almond azure blanched chiffon midnight  2       23      52
-Manufacturer#5 almond azure blanched chiffon midnight  3       23      69
+Manufacturer#4 almond aquamarine floral ivory bisque   1       27      51
+Manufacturer#4 almond aquamarine floral ivory bisque   2       27      66
+Manufacturer#4 almond aquamarine floral ivory bisque   3       27      81
+Manufacturer#4 almond aquamarine yellow dodger mint    1       7       7
+Manufacturer#4 almond aquamarine yellow dodger mint    2       7       14
+Manufacturer#4 almond aquamarine yellow dodger mint    3       7       21
+Manufacturer#4 almond azure aquamarine papaya violet   1       12      32
+Manufacturer#4 almond azure aquamarine papaya violet   2       12      34
+Manufacturer#4 almond azure aquamarine papaya violet   3       12      36
 Manufacturer#5 almond antique blue firebrick mint      1       31      77
 Manufacturer#5 almond antique blue firebrick mint      2       31      85
 Manufacturer#5 almond antique blue firebrick mint      3       31      93
+Manufacturer#5 almond antique medium spring khaki      1       6       10
+Manufacturer#5 almond antique medium spring khaki      2       6       14
+Manufacturer#5 almond antique medium spring khaki      3       6       18
+Manufacturer#5 almond antique sky peru orange  1       2       2
+Manufacturer#5 almond antique sky peru orange  2       2       4
+Manufacturer#5 almond antique sky peru orange  3       2       6
 Manufacturer#5 almond aquamarine dodger light gainsboro        1       46      
108
 Manufacturer#5 almond aquamarine dodger light gainsboro        2       46      
123
 Manufacturer#5 almond aquamarine dodger light gainsboro        3       46      
138
+Manufacturer#5 almond azure blanched chiffon midnight  1       23      35
+Manufacturer#5 almond azure blanched chiffon midnight  2       23      52
+Manufacturer#5 almond azure blanched chiffon midnight  3       23      69
 PREHOOK: query: -- 25. testMultipleInserts3SWQs
 CREATE TABLE part_1( 
 p_mfgr STRING, 
@@ -1523,30 +1527,30 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1 almond antique burnished rose metallic  2       4       10
 Manufacturer#1 almond antique burnished rose metallic  2       4       10
+Manufacturer#1 almond antique chartreuse lavender yellow       34      62      
76
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       10      
6
 Manufacturer#1 almond aquamarine burnished black steel 28      28      62
-Manufacturer#1 almond antique chartreuse lavender yellow       34      62      
76
 Manufacturer#1 almond aquamarine pink moccasin thistle 42      76      42
-Manufacturer#2 almond aquamarine midnight light salmon 2       2       2
 Manufacturer#2 almond antique violet chocolate turquoise       14      14      
32
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      32      43
-Manufacturer#2 almond aquamarine rose maroon antique   25      43      25
 Manufacturer#2 almond antique violet turquoise frosted 40      40      40
-Manufacturer#3 almond antique misty red olive  1       1       1
-Manufacturer#3 almond antique forest lavender goldenrod        14      14      
50
+Manufacturer#2 almond aquamarine midnight light salmon 2       2       2
+Manufacturer#2 almond aquamarine rose maroon antique   25      43      25
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      32      43
 Manufacturer#3 almond antique chartreuse khaki white   17      31      36
+Manufacturer#3 almond antique forest lavender goldenrod        14      14      
50
 Manufacturer#3 almond antique metallic orange dim      19      50      19
+Manufacturer#3 almond antique misty red olive  1       1       1
 Manufacturer#3 almond antique olive coral navajo       45      45      45
-Manufacturer#4 almond aquamarine yellow dodger mint    7       7       29
 Manufacturer#4 almond antique gainsboro frosted violet 10      17      22
-Manufacturer#4 almond azure aquamarine papaya violet   12      29      12
-Manufacturer#4 almond aquamarine floral ivory bisque   27      27      27
 Manufacturer#4 almond antique violet mint lemon        39      39      39
-Manufacturer#5 almond antique sky peru orange  2       2       8
-Manufacturer#5 almond antique medium spring khaki      6       8       6
-Manufacturer#5 almond azure blanched chiffon midnight  23      23      54
+Manufacturer#4 almond aquamarine floral ivory bisque   27      27      27
+Manufacturer#4 almond aquamarine yellow dodger mint    7       7       29
+Manufacturer#4 almond azure aquamarine papaya violet   12      29      12
 Manufacturer#5 almond antique blue firebrick mint      31      54      31
+Manufacturer#5 almond antique medium spring khaki      6       8       6
+Manufacturer#5 almond antique sky peru orange  2       2       8
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      46      
46
+Manufacturer#5 almond azure blanched chiffon midnight  23      23      54
 PREHOOK: query: -- 28. testPartOrderInUDAFInvoke
 select p_mfgr, p_name, p_size,
 sum(p_size) over (partition by p_mfgr  order by p_name  rows between 2 
preceding and 2 following) as s
@@ -2071,12 +2075,12 @@ Manufacturer#3  MEDIUM BURNISHED TIN    EDIU
 Manufacturer#3 PROMO ANODIZED TIN      ROMO ANODIZED TIN       4
 Manufacturer#3 STANDARD POLISHED STEEL TANDARD POLISHED STEEL  5
 Manufacturer#4 ECONOMY BRUSHED COPPER  CONOMY BRUSHED COPPER   1
+Manufacturer#4 PROMO POLISHED STEEL    ROMO POLISHED STEEL     4
 Manufacturer#4 SMALL BRUSHED BRASS     MALL BRUSHED BRASS      2
 Manufacturer#4 SMALL PLATED STEEL      MALL PLATED STEEL       3
-Manufacturer#4 PROMO POLISHED STEEL    ROMO POLISHED STEEL     4
 Manufacturer#4 STANDARD ANODIZED TIN   TANDARD ANODIZED TIN    5
-Manufacturer#5 LARGE BRUSHED BRASS     ARGE BRUSHED BRASS      1
 Manufacturer#5 ECONOMY BURNISHED STEEL CONOMY BURNISHED STEEL  2
+Manufacturer#5 LARGE BRUSHED BRASS     ARGE BRUSHED BRASS      1
 Manufacturer#5 MEDIUM BURNISHED TIN    EDIUM BURNISHED TIN     3
 Manufacturer#5 SMALL PLATED BRASS      MALL PLATED BRASS       4
 Manufacturer#5 STANDARD BURNISHED TIN  TANDARD BURNISHED TIN   5
@@ -2136,30 +2140,30 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1 almond antique burnished rose metallic  2       2346.3
 Manufacturer#1 almond antique burnished rose metallic  2       2346.3
+Manufacturer#1 almond antique chartreuse lavender yellow       34      
7117.070000000001
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       
3948.8900000000003
 Manufacturer#1 almond aquamarine burnished black steel 28      5363.31
-Manufacturer#1 almond antique chartreuse lavender yellow       34      
7117.070000000001
 Manufacturer#1 almond aquamarine pink moccasin thistle 42      
8749.730000000001
-Manufacturer#2 almond aquamarine midnight light salmon 2       2031.98
 Manufacturer#2 almond antique violet chocolate turquoise       14      3722.66
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      5424.26
-Manufacturer#2 almond aquamarine rose maroon antique   25      7122.92
 Manufacturer#2 almond antique violet turquoise frosted 40      8923.62
-Manufacturer#3 almond antique misty red olive  1       1922.98
-Manufacturer#3 almond antique forest lavender goldenrod        14      3113.25
+Manufacturer#2 almond aquamarine midnight light salmon 2       2031.98
+Manufacturer#2 almond aquamarine rose maroon antique   25      7122.92
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      5424.26
 Manufacturer#3 almond antique chartreuse khaki white   17      4784.93
+Manufacturer#3 almond antique forest lavender goldenrod        14      3113.25
 Manufacturer#3 almond antique metallic orange dim      19      
6195.320000000001
+Manufacturer#3 almond antique misty red olive  1       1922.98
 Manufacturer#3 almond antique olive coral navajo       45      
7532.610000000001
-Manufacturer#4 almond aquamarine yellow dodger mint    7       1844.92
 Manufacturer#4 almond antique gainsboro frosted violet 10      3465.59
-Manufacturer#4 almond azure aquamarine papaya violet   12      
4755.9400000000005
-Manufacturer#4 almond aquamarine floral ivory bisque   27      
5962.200000000001
 Manufacturer#4 almond antique violet mint lemon        39      
7337.620000000001
-Manufacturer#5 almond antique sky peru orange  2       1788.73
-Manufacturer#5 almond antique medium spring khaki      6       
3400.3900000000003
-Manufacturer#5 almond azure blanched chiffon midnight  23      
4864.870000000001
+Manufacturer#4 almond aquamarine floral ivory bisque   27      
5962.200000000001
+Manufacturer#4 almond aquamarine yellow dodger mint    7       1844.92
+Manufacturer#4 almond azure aquamarine papaya violet   12      
4755.9400000000005
 Manufacturer#5 almond antique blue firebrick mint      31      
6654.560000000001
+Manufacturer#5 almond antique medium spring khaki      6       
3400.3900000000003
+Manufacturer#5 almond antique sky peru orange  2       1788.73
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      
7672.660000000002
+Manufacturer#5 almond azure blanched chiffon midnight  23      
4864.870000000001
 PREHOOK: query: -- 42. testUnboundedFollowingForRows
 select p_mfgr, p_name, p_size,
     sum(p_retailprice) over (distribute by p_mfgr sort by p_name rows between 
current row and unbounded following) as s1
@@ -2174,8 +2178,8 @@ select p_mfgr, p_name, p_size,
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
-Manufacturer#1 almond antique burnished rose metallic  2       
8749.730000000001
 Manufacturer#1 almond antique burnished rose metallic  2       7576.58
+Manufacturer#1 almond antique burnished rose metallic  2       
8749.730000000001
 Manufacturer#1 almond antique chartreuse lavender yellow       34      6403.43
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       4649.67
 Manufacturer#1 almond aquamarine burnished black steel 28      3047.08
@@ -2216,30 +2220,30 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 Manufacturer#1 almond antique burnished rose metallic  2       
8749.730000000001
 Manufacturer#1 almond antique burnished rose metallic  2       
8749.730000000001
+Manufacturer#1 almond antique chartreuse lavender yellow       34      3386.42
 Manufacturer#1 almond antique salmon chartreuse burlywood      6       6403.43
 Manufacturer#1 almond aquamarine burnished black steel 28      4800.84
-Manufacturer#1 almond antique chartreuse lavender yellow       34      3386.42
 Manufacturer#1 almond aquamarine pink moccasin thistle 42      1632.66
-Manufacturer#2 almond aquamarine midnight light salmon 2       8923.62
 Manufacturer#2 almond antique violet chocolate turquoise       14      
6891.639999999999
-Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      5200.96
-Manufacturer#2 almond aquamarine rose maroon antique   25      3499.36
 Manufacturer#2 almond antique violet turquoise frosted 40      1800.7
-Manufacturer#3 almond antique misty red olive  1       7532.610000000001
-Manufacturer#3 almond antique forest lavender goldenrod        14      5609.63
+Manufacturer#2 almond aquamarine midnight light salmon 2       8923.62
+Manufacturer#2 almond aquamarine rose maroon antique   25      3499.36
+Manufacturer#2 almond aquamarine sandy cyan gainsboro  18      5200.96
 Manufacturer#3 almond antique chartreuse khaki white   17      
4419.360000000001
+Manufacturer#3 almond antique forest lavender goldenrod        14      5609.63
 Manufacturer#3 almond antique metallic orange dim      19      
2747.6800000000003
+Manufacturer#3 almond antique misty red olive  1       7532.610000000001
 Manufacturer#3 almond antique olive coral navajo       45      1337.29
-Manufacturer#4 almond aquamarine yellow dodger mint    7       
7337.620000000001
 Manufacturer#4 almond antique gainsboro frosted violet 10      5492.7
-Manufacturer#4 almond azure aquamarine papaya violet   12      
3872.0299999999997
-Manufacturer#4 almond aquamarine floral ivory bisque   27      
2581.6800000000003
 Manufacturer#4 almond antique violet mint lemon        39      1375.42
-Manufacturer#5 almond antique sky peru orange  2       7672.660000000002
-Manufacturer#5 almond antique medium spring khaki      6       5883.93
-Manufacturer#5 almond azure blanched chiffon midnight  23      4272.27
+Manufacturer#4 almond aquamarine floral ivory bisque   27      
2581.6800000000003
+Manufacturer#4 almond aquamarine yellow dodger mint    7       
7337.620000000001
+Manufacturer#4 almond azure aquamarine papaya violet   12      
3872.0299999999997
 Manufacturer#5 almond antique blue firebrick mint      31      2807.79
+Manufacturer#5 almond antique medium spring khaki      6       5883.93
+Manufacturer#5 almond antique sky peru orange  2       7672.660000000002
 Manufacturer#5 almond aquamarine dodger light gainsboro        46      1018.1
+Manufacturer#5 almond azure blanched chiffon midnight  23      4272.27
 PREHOOK: query: -- 44. testOverNoPartitionSingleAggregate
 select p_name, p_retailprice,
 round(avg(p_retailprice) over(),2)
@@ -2316,10 +2320,10 @@ POSTHOOK: Input: default@part
 #### A masked pattern was here ####
 1173.15        1458.2883333333336      8749.730000000001
 1173.15        1515.3160000000003      7576.580000000002
-1753.76        1600.8575000000003      6403.430000000001
-1602.59        1549.8900000000003      4649.670000000001
 1414.42        1523.5400000000004      3047.080000000001
+1602.59        1549.8900000000003      4649.670000000001
 1632.66        1632.6600000000008      1632.6600000000008
+1753.76        1600.8575000000003      6403.430000000001
 PREHOOK: query: -- 47. empty partition
 select sum(p_size) over (partition by p_mfgr )
 from part where p_mfgr = 'm1'

Modified: 
hive/branches/llap/ql/src/test/results/clientpositive/windowing_streaming.q.out
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/results/clientpositive/windowing_streaming.q.out?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/ql/src/test/results/clientpositive/windowing_streaming.q.out 
(original)
+++ 
hive/branches/llap/ql/src/test/results/clientpositive/windowing_streaming.q.out 
Fri Jan 23 19:59:11 2015
@@ -74,9 +74,10 @@ STAGE PLANS:
                 sort order: ++
                 Map-reduce partition columns: _col1 (type: string)
                 Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
@@ -129,9 +130,10 @@ STAGE PLANS:
                 Map-reduce partition columns: _col1 (type: string)
                 Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
                 TopN Hash Memory Usage: 0.8
-                value expressions: _col0 (type: string), _col1 (type: string)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey1 (type: string), KEY.reducesinkkey0 
(type: string)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
@@ -282,9 +284,10 @@ STAGE PLANS:
                 Map-reduce partition columns: _col0 (type: tinyint)
                 Statistics: Num rows: 12288 Data size: 377237 Basic stats: 
COMPLETE Column stats: NONE
                 TopN Hash Memory Usage: 0.8
-                value expressions: _col0 (type: tinyint), _col1 (type: double)
       Reduce Operator Tree:
-        Extract
+        Select Operator
+          expressions: KEY.reducesinkkey0 (type: tinyint), KEY.reducesinkkey1 
(type: double)
+          outputColumnNames: _col0, _col1
           Statistics: Num rows: 12288 Data size: 377237 Basic stats: COMPLETE 
Column stats: NONE
           PTF Operator
             Statistics: Num rows: 12288 Data size: 377237 Basic stats: 
COMPLETE Column stats: NONE

Modified: hive/branches/llap/ql/src/test/templates/TestCliDriver.vm
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/ql/src/test/templates/TestCliDriver.vm?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/ql/src/test/templates/TestCliDriver.vm (original)
+++ hive/branches/llap/ql/src/test/templates/TestCliDriver.vm Fri Jan 23 
19:59:11 2015
@@ -52,7 +52,7 @@ public class $className extends TestCase
       System.err.println("Exception: " + e.getMessage());
       e.printStackTrace();
       System.err.flush();
-      fail("Unexpected exception in static initialization"+e.getMessage());
+      fail("Unexpected exception in static initialization: "+e.getMessage());
     }
   }
 

Modified: hive/branches/llap/serde/pom.xml
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/pom.xml?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- hive/branches/llap/serde/pom.xml (original)
+++ hive/branches/llap/serde/pom.xml Fri Jan 23 19:59:11 2015
@@ -46,6 +46,11 @@
     </dependency>
     <!-- inter-project -->
     <dependency>
+      <groupId>com.google.code.findbugs</groupId>
+      <artifactId>jsr305</artifactId>
+      <version>${jsr305.version}</version>
+    </dependency>
+    <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>${commons-codec.version}</version>

Modified: 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java
 (original)
+++ 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerDe.java
 Fri Jan 23 19:59:11 2015
@@ -100,7 +100,7 @@ public class AvroSerDe extends AbstractS
         || 
properties.getProperty(AvroSerdeUtils.AvroTableProperties.SCHEMA_URL.getPropName())
 != null
         || columnNameProperty == null || columnNameProperty.isEmpty()
         || columnTypeProperty == null || columnTypeProperty.isEmpty()) {
-      schema = determineSchemaOrReturnErrorSchema(properties);
+      schema = determineSchemaOrReturnErrorSchema(configuration, properties);
     } else {
       // Get column names and sort order
       columnNames = Arrays.asList(columnNameProperty.split(","));
@@ -159,10 +159,10 @@ public class AvroSerDe extends AbstractS
    * any call, including calls to update the serde properties, meaning
    * if the serde is in a bad state, there is no way to update that state.
    */
-  public Schema determineSchemaOrReturnErrorSchema(Properties props) {
+  public Schema determineSchemaOrReturnErrorSchema(Configuration conf, 
Properties props) {
     try {
       configErrors = "";
-      return AvroSerdeUtils.determineSchemaOrThrowException(props);
+      return AvroSerdeUtils.determineSchemaOrThrowException(conf, props);
     } catch(AvroSerdeException he) {
       LOG.warn("Encountered AvroSerdeException determining schema. Returning " 
+
               "signal schema to indicate problem", he);

Modified: 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
 (original)
+++ 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/avro/AvroSerdeUtils.java
 Fri Jan 23 19:59:11 2015
@@ -97,7 +97,7 @@ public class AvroSerdeUtils {
    * @throws IOException if error while trying to read the schema from another 
location
    * @throws AvroSerdeException if unable to find a schema or pointer to it in 
the properties
    */
-  public static Schema determineSchemaOrThrowException(Properties properties)
+  public static Schema determineSchemaOrThrowException(Configuration conf, 
Properties properties)
           throws IOException, AvroSerdeException {
     String schemaString = 
properties.getProperty(AvroTableProperties.SCHEMA_LITERAL.getPropName());
     if(schemaString != null && !schemaString.equals(SCHEMA_NONE))
@@ -109,7 +109,7 @@ public class AvroSerdeUtils {
       throw new AvroSerdeException(EXCEPTION_MESSAGE);
 
     try {
-      Schema s = getSchemaFromFS(schemaString, new Configuration());
+      Schema s = getSchemaFromFS(schemaString, conf);
       if (s == null) {
         //in case schema is not a file system
         return AvroSerdeUtils.getSchemaFor(new URL(schemaString).openStream());

Modified: 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
 (original)
+++ 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/columnar/ColumnarSerDe.java
 Fri Jan 23 19:59:11 2015
@@ -113,7 +113,7 @@ public class ColumnarSerDe extends Colum
         cachedObjectInspector, notSkipIDs, serdeParams.getNullSequence());
 
     super.initialize(size);
-    LOG.info("ColumnarSerDe initialized with: columnNames="
+    LOG.debug("ColumnarSerDe initialized with: columnNames="
         + serdeParams.getColumnNames() + " columnTypes="
         + serdeParams.getColumnTypes() + " separator="
         + Arrays.asList(serdeParams.getSeparators()) + " nullstring="

Modified: 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableByteObjectInspector.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableByteObjectInspector.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableByteObjectInspector.java
 (original)
+++ 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableByteObjectInspector.java
 Fri Jan 23 19:59:11 2015
@@ -33,17 +33,17 @@ public class WritableByteObjectInspector
 
   @Override
   public byte get(Object o) {
-    return ((ByteWritable) o).get();
+    return ((org.apache.hadoop.io.ByteWritable) o).get();
   }
 
   @Override
   public Object copyObject(Object o) {
-    return o == null ? null : new ByteWritable(((ByteWritable) o).get());
+    return o == null ? null : new ByteWritable(get(o));
   }
 
   @Override
   public Object getPrimitiveJavaObject(Object o) {
-    return o == null ? null : Byte.valueOf(((ByteWritable) o).get());
+    return o == null ? null : Byte.valueOf(get(o));
   }
 
   @Override
@@ -53,7 +53,7 @@ public class WritableByteObjectInspector
 
   @Override
   public Object set(Object o, byte value) {
-    ((ByteWritable) o).set(value);
+    ((org.apache.hadoop.io.ByteWritable) o).set(value);
     return o;
   }
 }

Modified: 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableDoubleObjectInspector.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableDoubleObjectInspector.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableDoubleObjectInspector.java
 (original)
+++ 
hive/branches/llap/serde/src/java/org/apache/hadoop/hive/serde2/objectinspector/primitive/WritableDoubleObjectInspector.java
 Fri Jan 23 19:59:11 2015
@@ -33,17 +33,17 @@ public class WritableDoubleObjectInspect
 
   @Override
   public double get(Object o) {
-    return ((DoubleWritable) o).get();
+    return ((org.apache.hadoop.io.DoubleWritable) o).get();
   }
 
   @Override
   public Object copyObject(Object o) {
-    return o == null ? null : new DoubleWritable(((DoubleWritable) o).get());
+    return o == null ? null : new DoubleWritable(get(o));
   }
 
   @Override
   public Object getPrimitiveJavaObject(Object o) {
-    return o == null ? null : Double.valueOf(((DoubleWritable) o).get());
+    return o == null ? null : Double.valueOf(get(o));
   }
 
   @Override
@@ -53,7 +53,7 @@ public class WritableDoubleObjectInspect
 
   @Override
   public Object set(Object o, double value) {
-    ((DoubleWritable) o).set(value);
+    ((org.apache.hadoop.io.DoubleWritable) o).set(value);
     return o;
   }
 

Modified: 
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerdeUtils.java
URL: 
http://svn.apache.org/viewvc/hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerdeUtils.java?rev=1654355&r1=1654354&r2=1654355&view=diff
==============================================================================
--- 
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerdeUtils.java
 (original)
+++ 
hive/branches/llap/serde/src/test/org/apache/hadoop/hive/serde2/avro/TestAvroSerdeUtils.java
 Fri Jan 23 19:59:11 2015
@@ -117,26 +117,29 @@ public class TestAvroSerdeUtils {
 
   @Test(expected=AvroSerdeException.class)
   public void determineSchemaThrowsExceptionIfNoSchema() throws IOException, 
AvroSerdeException {
+    Configuration conf = new Configuration();
     Properties prop = new Properties();
-    AvroSerdeUtils.determineSchemaOrThrowException(prop);
+    AvroSerdeUtils.determineSchemaOrThrowException(conf, prop);
   }
 
   @Test
   public void determineSchemaFindsLiterals() throws Exception {
     String schema = TestAvroObjectInspectorGenerator.RECORD_SCHEMA;
+    Configuration conf = new Configuration();
     Properties props = new Properties();
     props.put(AvroSerdeUtils.SCHEMA_LITERAL, schema);
     Schema expected = AvroSerdeUtils.getSchemaFor(schema);
-    assertEquals(expected, 
AvroSerdeUtils.determineSchemaOrThrowException(props));
+    assertEquals(expected, 
AvroSerdeUtils.determineSchemaOrThrowException(conf, props));
   }
 
   @Test
   public void detemineSchemaTriesToOpenUrl() throws AvroSerdeException, 
IOException {
+    Configuration conf = new Configuration();
     Properties props = new Properties();
     props.put(AvroSerdeUtils.SCHEMA_URL, "not:///a.real.url");
 
     try {
-      AvroSerdeUtils.determineSchemaOrThrowException(props);
+      AvroSerdeUtils.determineSchemaOrThrowException(conf, props);
       fail("Should have tried to open that URL");
     } catch (AvroSerdeException e) {
       assertEquals("Unable to read schema from given path: not:///a.real.url", 
e.getMessage());
@@ -145,13 +148,14 @@ public class TestAvroSerdeUtils {
 
   @Test
   public void noneOptionWorksForSpecifyingSchemas() throws IOException, 
AvroSerdeException {
+    Configuration conf = new Configuration();
     Properties props = new Properties();
 
     // Combo 1: Both set to none
     props.put(SCHEMA_URL, SCHEMA_NONE);
     props.put(SCHEMA_LITERAL, SCHEMA_NONE);
     try {
-      determineSchemaOrThrowException(props);
+      determineSchemaOrThrowException(conf, props);
       fail("Should have thrown exception with none set for both url and 
literal");
     } catch(AvroSerdeException he) {
       assertEquals(EXCEPTION_MESSAGE, he.getMessage());
@@ -161,7 +165,7 @@ public class TestAvroSerdeUtils {
     props.put(SCHEMA_LITERAL, TestAvroObjectInspectorGenerator.RECORD_SCHEMA);
     Schema s;
     try {
-      s = determineSchemaOrThrowException(props);
+      s = determineSchemaOrThrowException(conf, props);
       assertNotNull(s);
       
assertEquals(AvroSerdeUtils.getSchemaFor(TestAvroObjectInspectorGenerator.RECORD_SCHEMA),
 s);
     } catch(AvroSerdeException he) {
@@ -172,7 +176,7 @@ public class TestAvroSerdeUtils {
     props.put(SCHEMA_LITERAL, SCHEMA_NONE);
     props.put(SCHEMA_URL, "not:///a.real.url");
     try {
-      determineSchemaOrThrowException(props);
+      determineSchemaOrThrowException(conf, props);
       fail("Should have tried to open that bogus URL");
     } catch (AvroSerdeException e) {
       assertEquals("Unable to read schema from given path: not:///a.real.url", 
e.getMessage());


Reply via email to