hive-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omal...@apache.org
Subject [27/43] hive git commit: HIVE-16787 Fix itests in branch-2.2
Date Thu, 20 Jul 2017 20:09:45 GMT
http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/llap/vector_outer_join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/llap/vector_outer_join6.q.out b/ql/src/test/results/clientpositive/llap/vector_outer_join6.q.out
new file mode 100644
index 0000000..736b8f9
--- /dev/null
+++ b/ql/src/test/results/clientpositive/llap/vector_outer_join6.q.out
@@ -0,0 +1,369 @@
+PREHOOK: query: create table TJOIN1_txt (RNUM int , C1 int, C2 int)
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN1_txt
+POSTHOOK: query: create table TJOIN1_txt (RNUM int , C1 int, C2 int)
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN1_txt
+PREHOOK: query: create table TJOIN2_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN2_txt
+POSTHOOK: query: create table TJOIN2_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN2_txt
+PREHOOK: query: create table if not exists TJOIN3_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN3_txt
+POSTHOOK: query: create table if not exists TJOIN3_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN3_txt
+PREHOOK: query: create table TJOIN4_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+PREHOOK: type: CREATETABLE
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN4_txt
+POSTHOOK: query: create table TJOIN4_txt (RNUM int , C1 int, C2 char(2))
+ROW FORMAT DELIMITED FIELDS TERMINATED BY '|' LINES TERMINATED BY '\n'
+POSTHOOK: type: CREATETABLE
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN4_txt
+PREHOOK: query: load data local inpath '../../data/files/TJOIN1' into table TJOIN1_txt
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@tjoin1_txt
+POSTHOOK: query: load data local inpath '../../data/files/TJOIN1' into table TJOIN1_txt
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@tjoin1_txt
+PREHOOK: query: load data local inpath '../../data/files/TJOIN2' into table TJOIN2_txt
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@tjoin2_txt
+POSTHOOK: query: load data local inpath '../../data/files/TJOIN2' into table TJOIN2_txt
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@tjoin2_txt
+PREHOOK: query: load data local inpath '../../data/files/TJOIN3' into table TJOIN3_txt
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@tjoin3_txt
+POSTHOOK: query: load data local inpath '../../data/files/TJOIN3' into table TJOIN3_txt
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@tjoin3_txt
+PREHOOK: query: load data local inpath '../../data/files/TJOIN4' into table TJOIN4_txt
+PREHOOK: type: LOAD
+#### A masked pattern was here ####
+PREHOOK: Output: default@tjoin4_txt
+POSTHOOK: query: load data local inpath '../../data/files/TJOIN4' into table TJOIN4_txt
+POSTHOOK: type: LOAD
+#### A masked pattern was here ####
+POSTHOOK: Output: default@tjoin4_txt
+PREHOOK: query: create table TJOIN1 stored as orc AS SELECT * FROM TJOIN1_txt
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@tjoin1_txt
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN1
+POSTHOOK: query: create table TJOIN1 stored as orc AS SELECT * FROM TJOIN1_txt
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@tjoin1_txt
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN1
+POSTHOOK: Lineage: tjoin1.c1 SIMPLE [(tjoin1_txt)tjoin1_txt.FieldSchema(name:c1, type:int, comment:null), ]
+POSTHOOK: Lineage: tjoin1.c2 SIMPLE [(tjoin1_txt)tjoin1_txt.FieldSchema(name:c2, type:int, comment:null), ]
+POSTHOOK: Lineage: tjoin1.rnum SIMPLE [(tjoin1_txt)tjoin1_txt.FieldSchema(name:rnum, type:int, comment:null), ]
+PREHOOK: query: create table TJOIN2 stored as orc AS SELECT * FROM TJOIN2_txt
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@tjoin2_txt
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN2
+POSTHOOK: query: create table TJOIN2 stored as orc AS SELECT * FROM TJOIN2_txt
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@tjoin2_txt
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN2
+POSTHOOK: Lineage: tjoin2.c1 SIMPLE [(tjoin2_txt)tjoin2_txt.FieldSchema(name:c1, type:int, comment:null), ]
+POSTHOOK: Lineage: tjoin2.c2 SIMPLE [(tjoin2_txt)tjoin2_txt.FieldSchema(name:c2, type:char(2), comment:null), ]
+POSTHOOK: Lineage: tjoin2.rnum SIMPLE [(tjoin2_txt)tjoin2_txt.FieldSchema(name:rnum, type:int, comment:null), ]
+PREHOOK: query: create table TJOIN3 stored as orc AS SELECT * FROM TJOIN3_txt
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@tjoin3_txt
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN3
+POSTHOOK: query: create table TJOIN3 stored as orc AS SELECT * FROM TJOIN3_txt
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@tjoin3_txt
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN3
+POSTHOOK: Lineage: tjoin3.c1 SIMPLE [(tjoin3_txt)tjoin3_txt.FieldSchema(name:c1, type:int, comment:null), ]
+POSTHOOK: Lineage: tjoin3.c2 SIMPLE [(tjoin3_txt)tjoin3_txt.FieldSchema(name:c2, type:char(2), comment:null), ]
+POSTHOOK: Lineage: tjoin3.rnum SIMPLE [(tjoin3_txt)tjoin3_txt.FieldSchema(name:rnum, type:int, comment:null), ]
+PREHOOK: query: create table TJOIN4 stored as orc AS SELECT * FROM TJOIN4_txt
+PREHOOK: type: CREATETABLE_AS_SELECT
+PREHOOK: Input: default@tjoin4_txt
+PREHOOK: Output: database:default
+PREHOOK: Output: default@TJOIN4
+POSTHOOK: query: create table TJOIN4 stored as orc AS SELECT * FROM TJOIN4_txt
+POSTHOOK: type: CREATETABLE_AS_SELECT
+POSTHOOK: Input: default@tjoin4_txt
+POSTHOOK: Output: database:default
+POSTHOOK: Output: default@TJOIN4
+POSTHOOK: Lineage: tjoin4.c1 SIMPLE [(tjoin4_txt)tjoin4_txt.FieldSchema(name:c1, type:int, comment:null), ]
+POSTHOOK: Lineage: tjoin4.c2 SIMPLE [(tjoin4_txt)tjoin4_txt.FieldSchema(name:c2, type:char(2), comment:null), ]
+POSTHOOK: Lineage: tjoin4.rnum SIMPLE [(tjoin4_txt)tjoin4_txt.FieldSchema(name:rnum, type:int, comment:null), ]
+PREHOOK: query: explain
+select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Map 1 <- Map 2 (BROADCAST_EDGE), Map 3 (BROADCAST_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin1
+                  Statistics: Num rows: 3 Data size: 32 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: rnum (type: int), c1 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 3 Data size: 32 Basic stats: COMPLETE Column stats: NONE
+                    Map Join Operator
+                      condition map:
+                           Left Outer Join0 to 1
+                      keys:
+                        0 _col1 (type: int)
+                        1 _col1 (type: int)
+                      outputColumnNames: _col0, _col2, _col3
+                      input vertices:
+                        1 Map 2
+                      Statistics: Num rows: 4 Data size: 409 Basic stats: COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: int), _col2 (type: int), _col3 (type: int)
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 4 Data size: 409 Basic stats: COMPLETE Column stats: NONE
+                        Map Join Operator
+                          condition map:
+                               Left Outer Join0 to 1
+                          keys:
+                            0 _col2 (type: int)
+                            1 _col1 (type: int)
+                          outputColumnNames: _col0, _col1, _col3
+                          input vertices:
+                            1 Map 3
+                          Statistics: Num rows: 4 Data size: 449 Basic stats: COMPLETE Column stats: NONE
+                          Select Operator
+                            expressions: _col0 (type: int), _col1 (type: int), _col3 (type: int)
+                            outputColumnNames: _col0, _col1, _col2
+                            Statistics: Num rows: 4 Data size: 449 Basic stats: COMPLETE Column stats: NONE
+                            File Output Operator
+                              compressed: false
+                              Statistics: Num rows: 4 Data size: 449 Basic stats: COMPLETE Column stats: NONE
+                              table:
+                                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+        Map 2 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin2
+                  Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: rnum (type: int), c1 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: _col1 (type: int)
+                      sort order: +
+                      Map-reduce partition columns: _col1 (type: int)
+                      Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: _col0 (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+        Map 3 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin3
+                  Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: rnum (type: int), c1 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: _col1 (type: int)
+                      sort order: +
+                      Map-reduce partition columns: _col1 (type: int)
+                      Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: _col0 (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tjoin1
+PREHOOK: Input: default@tjoin2
+PREHOOK: Input: default@tjoin3
+#### A masked pattern was here ####
+POSTHOOK: query: select tj1rnum, tj2rnum, tjoin3.rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tjoin1
+POSTHOOK: Input: default@tjoin2
+POSTHOOK: Input: default@tjoin3
+#### A masked pattern was here ####
+0	0	0
+0	3	0
+1	NULL	NULL
+2	NULL	NULL
+PREHOOK: query: explain
+select tj1rnum, tj2rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select tj1rnum, tj2rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-1 is a root stage
+  Stage-0 depends on stages: Stage-1
+
+STAGE PLANS:
+  Stage: Stage-1
+    Tez
+#### A masked pattern was here ####
+      Edges:
+        Map 1 <- Map 2 (BROADCAST_EDGE), Map 3 (BROADCAST_EDGE)
+#### A masked pattern was here ####
+      Vertices:
+        Map 1 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin1
+                  Statistics: Num rows: 3 Data size: 32 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: rnum (type: int), c1 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 3 Data size: 32 Basic stats: COMPLETE Column stats: NONE
+                    Map Join Operator
+                      condition map:
+                           Left Outer Join0 to 1
+                      keys:
+                        0 _col1 (type: int)
+                        1 _col1 (type: int)
+                      outputColumnNames: _col0, _col2, _col3
+                      input vertices:
+                        1 Map 2
+                      Statistics: Num rows: 4 Data size: 409 Basic stats: COMPLETE Column stats: NONE
+                      Select Operator
+                        expressions: _col0 (type: int), _col2 (type: int), _col3 (type: int)
+                        outputColumnNames: _col0, _col1, _col2
+                        Statistics: Num rows: 4 Data size: 409 Basic stats: COMPLETE Column stats: NONE
+                        Map Join Operator
+                          condition map:
+                               Left Outer Join0 to 1
+                          keys:
+                            0 _col2 (type: int)
+                            1 _col0 (type: int)
+                          outputColumnNames: _col0, _col1
+                          input vertices:
+                            1 Map 3
+                          Statistics: Num rows: 4 Data size: 449 Basic stats: COMPLETE Column stats: NONE
+                          File Output Operator
+                            compressed: false
+                            Statistics: Num rows: 4 Data size: 449 Basic stats: COMPLETE Column stats: NONE
+                            table:
+                                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+        Map 2 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin2
+                  Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: rnum (type: int), c1 (type: int)
+                    outputColumnNames: _col0, _col1
+                    Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: _col1 (type: int)
+                      sort order: +
+                      Map-reduce partition columns: _col1 (type: int)
+                      Statistics: Num rows: 4 Data size: 372 Basic stats: COMPLETE Column stats: NONE
+                      value expressions: _col0 (type: int)
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+        Map 3 
+            Map Operator Tree:
+                TableScan
+                  alias: tjoin3
+                  Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+                  Select Operator
+                    expressions: c1 (type: int)
+                    outputColumnNames: _col0
+                    Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+                    Reduce Output Operator
+                      key expressions: _col0 (type: int)
+                      sort order: +
+                      Map-reduce partition columns: _col0 (type: int)
+                      Statistics: Num rows: 2 Data size: 188 Basic stats: COMPLETE Column stats: NONE
+            Execution mode: vectorized, llap
+            LLAP IO: all inputs
+
+  Stage: Stage-0
+    Fetch Operator
+      limit: -1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select tj1rnum, tj2rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@tjoin1
+PREHOOK: Input: default@tjoin2
+PREHOOK: Input: default@tjoin3
+#### A masked pattern was here ####
+POSTHOOK: query: select tj1rnum, tj2rnum as rnumt3 from
+   (select tjoin1.rnum tj1rnum, tjoin2.rnum tj2rnum, tjoin2.c1 tj2c1 from tjoin1 left outer join tjoin2 on tjoin1.c1 = tjoin2.c1 ) tj left outer join tjoin3 on tj2c1 = tjoin3.c1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@tjoin1
+POSTHOOK: Input: default@tjoin2
+POSTHOOK: Input: default@tjoin3
+#### A masked pattern was here ####
+0	0
+0	3
+1	NULL
+2	NULL

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out b/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
index 2654c4b..edcb77d 100644
--- a/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
+++ b/ql/src/test/results/clientpositive/orc_schema_evolution_float.q.out
@@ -36,8 +36,8 @@ POSTHOOK: query: select f from float_text
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_text
 #### A masked pattern was here ####
-74.72
 0.22
+74.72
 PREHOOK: query: alter table float_text change column f f double
 PREHOOK: type: ALTERTABLE_RENAMECOL
 PREHOOK: Input: default@float_text
@@ -54,8 +54,8 @@ POSTHOOK: query: select f from float_text
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_text
 #### A masked pattern was here ####
-74.72
 0.22
+74.72
 PREHOOK: query: select f from float_text where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@float_text
@@ -90,8 +90,8 @@ POSTHOOK: query: select f from float_text
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_text
 #### A masked pattern was here ####
-74.72000
 0.22000
+74.72000
 PREHOOK: query: select f from float_text where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@float_text
@@ -135,8 +135,8 @@ POSTHOOK: query: select f from float_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_orc
 #### A masked pattern was here ####
-74.72
 0.22
+74.72
 PREHOOK: query: alter table float_orc change column f f double
 PREHOOK: type: ALTERTABLE_RENAMECOL
 PREHOOK: Input: default@float_orc
@@ -153,8 +153,8 @@ POSTHOOK: query: select f from float_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_orc
 #### A masked pattern was here ####
-74.72
 0.22
+74.72
 PREHOOK: query: select f from float_orc where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@float_orc
@@ -207,8 +207,8 @@ POSTHOOK: query: select f from float_orc
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@float_orc
 #### A masked pattern was here ####
-74.72000
 0.22000
+74.72000
 PREHOOK: query: select f from float_orc where f=74.72
 PREHOOK: type: QUERY
 PREHOOK: Input: default@float_orc

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/order_null.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/order_null.q.out b/ql/src/test/results/clientpositive/order_null.q.out
index 23482b9..36d2363 100644
--- a/ql/src/test/results/clientpositive/order_null.q.out
+++ b/ql/src/test/results/clientpositive/order_null.q.out
@@ -76,9 +76,9 @@ POSTHOOK: Input: default@src_null
 #### A masked pattern was here ####
 NULL	NULL
 1	A
-2	B
 2	A
 2	NULL
+2	B
 3	NULL
 PREHOOK: query: SELECT x.* FROM src_null x ORDER BY a desc
 PREHOOK: type: QUERY
@@ -89,9 +89,9 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_null
 #### A masked pattern was here ####
 3	NULL
-2	B
 2	A
 2	NULL
+2	B
 1	A
 NULL	NULL
 PREHOOK: query: SELECT x.* FROM src_null x ORDER BY b asc, a asc nulls last
@@ -132,9 +132,9 @@ POSTHOOK: Input: default@src_null
 #### A masked pattern was here ####
 NULL	NULL
 1	A
-2	B
 2	A
 2	NULL
+2	B
 3	NULL
 PREHOOK: query: SELECT x.* FROM src_null x ORDER BY a desc nulls first
 PREHOOK: type: QUERY
@@ -146,9 +146,9 @@ POSTHOOK: Input: default@src_null
 #### A masked pattern was here ####
 NULL	NULL
 3	NULL
-2	B
 2	A
 2	NULL
+2	B
 1	A
 PREHOOK: query: SELECT x.* FROM src_null x ORDER BY b asc nulls last, a
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/perf/query83.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/perf/query83.q.out b/ql/src/test/results/clientpositive/perf/query83.q.out
index ee448d4..9960bc7 100644
--- a/ql/src/test/results/clientpositive/perf/query83.q.out
+++ b/ql/src/test/results/clientpositive/perf/query83.q.out
@@ -160,279 +160,279 @@ Stage-0
     limit:100
     Stage-1
       Reducer 6
-      File Output Operator [FS_137]
-        Limit [LIM_136] (rows=100 width=77)
+      File Output Operator [FS_134]
+        Limit [LIM_133] (rows=100 width=77)
           Number of rows:100
-          Select Operator [SEL_135] (rows=76653825 width=77)
+          Select Operator [SEL_132] (rows=76653825 width=77)
             Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
           <-Reducer 5 [SIMPLE_EDGE]
-            SHUFFLE [RS_134]
-              Select Operator [SEL_133] (rows=76653825 width=77)
+            SHUFFLE [RS_131]
+              Select Operator [SEL_130] (rows=76653825 width=77)
                 Output:["_col0","_col1","_col2","_col3","_col4","_col5","_col6","_col7"]
-                Merge Join Operator [MERGEJOIN_231] (rows=76653825 width=77)
-                  Conds:RS_129._col0=RS_130._col0(Inner),RS_129._col0=RS_131._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
+                Merge Join Operator [MERGEJOIN_228] (rows=76653825 width=77)
+                  Conds:RS_126._col0=RS_127._col0(Inner),RS_126._col0=RS_128._col0(Inner),Output:["_col0","_col1","_col3","_col5"]
                 <-Reducer 18 [SIMPLE_EDGE]
-                  SHUFFLE [RS_130]
+                  SHUFFLE [RS_127]
                     PartitionCols:_col0
-                    Group By Operator [GBY_84] (rows=34842647 width=77)
+                    Group By Operator [GBY_82] (rows=34842647 width=77)
                       Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 17 [SIMPLE_EDGE]
-                      SHUFFLE [RS_83]
+                      SHUFFLE [RS_81]
                         PartitionCols:_col0
-                        Group By Operator [GBY_82] (rows=69685294 width=77)
-                          Output:["_col0","_col1"],aggregations:["sum(_col0)"],keys:_col1
-                          Filter Operator [FIL_80] (rows=69685294 width=77)
-                            predicate:_col1 is not null
-                            Select Operator [SEL_79] (rows=69685294 width=77)
-                              Output:["_col0","_col1"]
-                              Merge Join Operator [MERGEJOIN_229] (rows=69685294 width=77)
-                                Conds:RS_76._col0=RS_77._col0(Inner),Output:["_col2","_col4"]
-                              <-Reducer 16 [SIMPLE_EDGE]
-                                SHUFFLE [RS_76]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_222] (rows=63350266 width=77)
-                                    Conds:RS_73._col1=RS_74._col0(Inner),Output:["_col0","_col2","_col4"]
-                                  <-Map 15 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_73]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_45] (rows=57591150 width=77)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_209] (rows=57591150 width=77)
-                                          predicate:(sr_item_sk is not null and sr_returned_date_sk is not null)
-                                          TableScan [TS_43] (rows=57591150 width=77)
-                                            default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_return_quantity"]
-                                  <-Map 19 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_74]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_48] (rows=462000 width=1436)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_210] (rows=462000 width=1436)
-                                          predicate:i_item_sk is not null
-                                          TableScan [TS_46] (rows=462000 width=1436)
-                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                              <-Reducer 21 [SIMPLE_EDGE]
-                                SHUFFLE [RS_77]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_224] (rows=80353 width=1119)
-                                    Conds:RS_69._col1=RS_70._col0(Inner),Output:["_col0"]
-                                  <-Map 20 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_69]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_51] (rows=73049 width=1119)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_211] (rows=73049 width=1119)
-                                          predicate:d_date_sk is not null
-                                          TableScan [TS_49] (rows=73049 width=1119)
-                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                  <-Reducer 24 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_70]
-                                      PartitionCols:_col0
-                                      Group By Operator [GBY_67] (rows=40176 width=1119)
-                                        Output:["_col0"],keys:KEY._col0
-                                      <-Reducer 23 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_66]
-                                          PartitionCols:_col0
-                                          Group By Operator [GBY_65] (rows=80353 width=1119)
-                                            Output:["_col0"],keys:_col0
-                                            Merge Join Operator [MERGEJOIN_223] (rows=80353 width=1119)
-                                              Conds:RS_61._col1=RS_62._col0(Inner),Output:["_col0"]
-                                            <-Map 22 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_61]
-                                                PartitionCols:_col1
-                                                Select Operator [SEL_53] (rows=73049 width=1119)
-                                                  Output:["_col0","_col1"]
-                                                  TableScan [TS_52] (rows=73049 width=1119)
+                        Group By Operator [GBY_80] (rows=69685294 width=77)
+                          Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
+                          Select Operator [SEL_79] (rows=69685294 width=77)
+                            Output:["_col4","_col2"]
+                            Merge Join Operator [MERGEJOIN_226] (rows=69685294 width=77)
+                              Conds:RS_76._col0=RS_77._col0(Inner),Output:["_col2","_col4"]
+                            <-Reducer 16 [SIMPLE_EDGE]
+                              SHUFFLE [RS_76]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_219] (rows=63350266 width=77)
+                                  Conds:RS_73._col1=RS_74._col0(Inner),Output:["_col0","_col2","_col4"]
+                                <-Map 15 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_73]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_44] (rows=57591150 width=77)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_206] (rows=57591150 width=77)
+                                        predicate:(sr_item_sk is not null and sr_returned_date_sk is not null)
+                                        TableScan [TS_42] (rows=57591150 width=77)
+                                          default@store_returns,store_returns,Tbl:COMPLETE,Col:NONE,Output:["sr_returned_date_sk","sr_item_sk","sr_return_quantity"]
+                                <-Map 19 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_74]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_47] (rows=462000 width=1436)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_207] (rows=462000 width=1436)
+                                        predicate:(i_item_sk is not null and i_item_id is not null)
+                                        TableScan [TS_45] (rows=462000 width=1436)
+                                          default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                            <-Reducer 21 [SIMPLE_EDGE]
+                              SHUFFLE [RS_77]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_221] (rows=80353 width=1119)
+                                  Conds:RS_69._col1=RS_70._col0(Inner),Output:["_col0"]
+                                <-Map 20 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_69]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_50] (rows=73049 width=1119)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_208] (rows=73049 width=1119)
+                                        predicate:(d_date is not null and d_date_sk is not null)
+                                        TableScan [TS_48] (rows=73049 width=1119)
+                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                <-Reducer 24 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_70]
+                                    PartitionCols:_col0
+                                    Group By Operator [GBY_67] (rows=40176 width=1119)
+                                      Output:["_col0"],keys:KEY._col0
+                                    <-Reducer 23 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_66]
+                                        PartitionCols:_col0
+                                        Group By Operator [GBY_65] (rows=80353 width=1119)
+                                          Output:["_col0"],keys:_col0
+                                          Merge Join Operator [MERGEJOIN_220] (rows=80353 width=1119)
+                                            Conds:RS_61._col1=RS_62._col0(Inner),Output:["_col0"]
+                                          <-Map 22 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_61]
+                                              PartitionCols:_col1
+                                              Select Operator [SEL_53] (rows=73049 width=1119)
+                                                Output:["_col0","_col1"]
+                                                Filter Operator [FIL_209] (rows=73049 width=1119)
+                                                  predicate:(d_week_seq is not null and d_date is not null)
+                                                  TableScan [TS_51] (rows=73049 width=1119)
                                                     default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                            <-Reducer 26 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_62]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_59] (rows=18262 width=1119)
-                                                  Output:["_col0"],keys:KEY._col0
-                                                <-Map 25 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_58]
-                                                    PartitionCols:_col0
-                                                    Group By Operator [GBY_57] (rows=36525 width=1119)
-                                                      Output:["_col0"],keys:d_week_seq
-                                                      Select Operator [SEL_56] (rows=36525 width=1119)
-                                                        Output:["d_week_seq"]
-                                                        Filter Operator [FIL_213] (rows=36525 width=1119)
-                                                          predicate:(d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')
-                                                          TableScan [TS_54] (rows=73049 width=1119)
-                                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                          <-Reducer 26 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_62]
+                                              PartitionCols:_col0
+                                              Group By Operator [GBY_59] (rows=18262 width=1119)
+                                                Output:["_col0"],keys:KEY._col0
+                                              <-Map 25 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_58]
+                                                  PartitionCols:_col0
+                                                  Group By Operator [GBY_57] (rows=36525 width=1119)
+                                                    Output:["_col0"],keys:d_week_seq
+                                                    Select Operator [SEL_56] (rows=36525 width=1119)
+                                                      Output:["d_week_seq"]
+                                                      Filter Operator [FIL_210] (rows=36525 width=1119)
+                                                        predicate:((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
+                                                        TableScan [TS_54] (rows=73049 width=1119)
+                                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                 <-Reducer 30 [SIMPLE_EDGE]
-                  SHUFFLE [RS_131]
+                  SHUFFLE [RS_128]
                     PartitionCols:_col0
-                    Group By Operator [GBY_127] (rows=8711072 width=92)
+                    Group By Operator [GBY_124] (rows=8711072 width=92)
                       Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 29 [SIMPLE_EDGE]
-                      SHUFFLE [RS_126]
+                      SHUFFLE [RS_123]
                         PartitionCols:_col0
-                        Group By Operator [GBY_125] (rows=17422145 width=92)
-                          Output:["_col0","_col1"],aggregations:["sum(_col0)"],keys:_col1
-                          Filter Operator [FIL_123] (rows=17422145 width=92)
-                            predicate:_col1 is not null
-                            Select Operator [SEL_122] (rows=17422145 width=92)
-                              Output:["_col0","_col1"]
-                              Merge Join Operator [MERGEJOIN_230] (rows=17422145 width=92)
-                                Conds:RS_119._col0=RS_120._col0(Inner),Output:["_col2","_col4"]
-                              <-Reducer 28 [SIMPLE_EDGE]
-                                SHUFFLE [RS_119]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_225] (rows=15838314 width=92)
-                                    Conds:RS_116._col1=RS_117._col0(Inner),Output:["_col0","_col2","_col4"]
-                                  <-Map 27 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_116]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_88] (rows=14398467 width=92)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_214] (rows=14398467 width=92)
-                                          predicate:(wr_item_sk is not null and wr_returned_date_sk is not null)
-                                          TableScan [TS_86] (rows=14398467 width=92)
-                                            default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_returned_date_sk","wr_item_sk","wr_return_quantity"]
-                                  <-Map 31 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_117]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_91] (rows=462000 width=1436)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_215] (rows=462000 width=1436)
-                                          predicate:i_item_sk is not null
-                                          TableScan [TS_89] (rows=462000 width=1436)
-                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                              <-Reducer 33 [SIMPLE_EDGE]
-                                SHUFFLE [RS_120]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_227] (rows=80353 width=1119)
-                                    Conds:RS_112._col1=RS_113._col0(Inner),Output:["_col0"]
-                                  <-Map 32 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_112]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_94] (rows=73049 width=1119)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_216] (rows=73049 width=1119)
-                                          predicate:d_date_sk is not null
-                                          TableScan [TS_92] (rows=73049 width=1119)
-                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                  <-Reducer 36 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_113]
-                                      PartitionCols:_col0
-                                      Group By Operator [GBY_110] (rows=40176 width=1119)
-                                        Output:["_col0"],keys:KEY._col0
-                                      <-Reducer 35 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_109]
-                                          PartitionCols:_col0
-                                          Group By Operator [GBY_108] (rows=80353 width=1119)
-                                            Output:["_col0"],keys:_col0
-                                            Merge Join Operator [MERGEJOIN_226] (rows=80353 width=1119)
-                                              Conds:RS_104._col1=RS_105._col0(Inner),Output:["_col0"]
-                                            <-Map 34 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_104]
-                                                PartitionCols:_col1
-                                                Select Operator [SEL_96] (rows=73049 width=1119)
-                                                  Output:["_col0","_col1"]
-                                                  TableScan [TS_95] (rows=73049 width=1119)
+                        Group By Operator [GBY_122] (rows=17422145 width=92)
+                          Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
+                          Select Operator [SEL_121] (rows=17422145 width=92)
+                            Output:["_col4","_col2"]
+                            Merge Join Operator [MERGEJOIN_227] (rows=17422145 width=92)
+                              Conds:RS_118._col0=RS_119._col0(Inner),Output:["_col2","_col4"]
+                            <-Reducer 28 [SIMPLE_EDGE]
+                              SHUFFLE [RS_118]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_222] (rows=15838314 width=92)
+                                  Conds:RS_115._col1=RS_116._col0(Inner),Output:["_col0","_col2","_col4"]
+                                <-Map 27 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_115]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_86] (rows=14398467 width=92)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_211] (rows=14398467 width=92)
+                                        predicate:(wr_item_sk is not null and wr_returned_date_sk is not null)
+                                        TableScan [TS_84] (rows=14398467 width=92)
+                                          default@web_returns,web_returns,Tbl:COMPLETE,Col:NONE,Output:["wr_returned_date_sk","wr_item_sk","wr_return_quantity"]
+                                <-Map 31 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_116]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_89] (rows=462000 width=1436)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_212] (rows=462000 width=1436)
+                                        predicate:(i_item_sk is not null and i_item_id is not null)
+                                        TableScan [TS_87] (rows=462000 width=1436)
+                                          default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                            <-Reducer 33 [SIMPLE_EDGE]
+                              SHUFFLE [RS_119]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_224] (rows=80353 width=1119)
+                                  Conds:RS_111._col1=RS_112._col0(Inner),Output:["_col0"]
+                                <-Map 32 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_111]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_92] (rows=73049 width=1119)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_213] (rows=73049 width=1119)
+                                        predicate:(d_date is not null and d_date_sk is not null)
+                                        TableScan [TS_90] (rows=73049 width=1119)
+                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                <-Reducer 36 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_112]
+                                    PartitionCols:_col0
+                                    Group By Operator [GBY_109] (rows=40176 width=1119)
+                                      Output:["_col0"],keys:KEY._col0
+                                    <-Reducer 35 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_108]
+                                        PartitionCols:_col0
+                                        Group By Operator [GBY_107] (rows=80353 width=1119)
+                                          Output:["_col0"],keys:_col0
+                                          Merge Join Operator [MERGEJOIN_223] (rows=80353 width=1119)
+                                            Conds:RS_103._col1=RS_104._col0(Inner),Output:["_col0"]
+                                          <-Map 34 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_103]
+                                              PartitionCols:_col1
+                                              Select Operator [SEL_95] (rows=73049 width=1119)
+                                                Output:["_col0","_col1"]
+                                                Filter Operator [FIL_214] (rows=73049 width=1119)
+                                                  predicate:(d_week_seq is not null and d_date is not null)
+                                                  TableScan [TS_93] (rows=73049 width=1119)
                                                     default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                            <-Reducer 38 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_105]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_102] (rows=18262 width=1119)
-                                                  Output:["_col0"],keys:KEY._col0
-                                                <-Map 37 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_101]
-                                                    PartitionCols:_col0
-                                                    Group By Operator [GBY_100] (rows=36525 width=1119)
-                                                      Output:["_col0"],keys:d_week_seq
-                                                      Select Operator [SEL_99] (rows=36525 width=1119)
-                                                        Output:["d_week_seq"]
-                                                        Filter Operator [FIL_218] (rows=36525 width=1119)
-                                                          predicate:(d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')
-                                                          TableScan [TS_97] (rows=73049 width=1119)
-                                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                          <-Reducer 38 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_104]
+                                              PartitionCols:_col0
+                                              Group By Operator [GBY_101] (rows=18262 width=1119)
+                                                Output:["_col0"],keys:KEY._col0
+                                              <-Map 37 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_100]
+                                                  PartitionCols:_col0
+                                                  Group By Operator [GBY_99] (rows=36525 width=1119)
+                                                    Output:["_col0"],keys:d_week_seq
+                                                    Select Operator [SEL_98] (rows=36525 width=1119)
+                                                      Output:["d_week_seq"]
+                                                      Filter Operator [FIL_215] (rows=36525 width=1119)
+                                                        predicate:((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
+                                                        TableScan [TS_96] (rows=73049 width=1119)
+                                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
                 <-Reducer 4 [SIMPLE_EDGE]
-                  SHUFFLE [RS_129]
+                  SHUFFLE [RS_126]
                     PartitionCols:_col0
-                    Group By Operator [GBY_41] (rows=17423323 width=106)
+                    Group By Operator [GBY_40] (rows=17423323 width=106)
                       Output:["_col0","_col1"],aggregations:["sum(VALUE._col0)"],keys:KEY._col0
                     <-Reducer 3 [SIMPLE_EDGE]
-                      SHUFFLE [RS_40]
+                      SHUFFLE [RS_39]
                         PartitionCols:_col0
-                        Group By Operator [GBY_39] (rows=34846646 width=106)
-                          Output:["_col0","_col1"],aggregations:["sum(_col0)"],keys:_col1
-                          Filter Operator [FIL_37] (rows=34846646 width=106)
-                            predicate:_col1 is not null
-                            Select Operator [SEL_36] (rows=34846646 width=106)
-                              Output:["_col0","_col1"]
-                              Merge Join Operator [MERGEJOIN_228] (rows=34846646 width=106)
-                                Conds:RS_33._col0=RS_34._col0(Inner),Output:["_col2","_col4"]
-                              <-Reducer 2 [SIMPLE_EDGE]
-                                SHUFFLE [RS_33]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_219] (rows=31678769 width=106)
-                                    Conds:RS_30._col1=RS_31._col0(Inner),Output:["_col0","_col2","_col4"]
-                                  <-Map 1 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_30]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_2] (rows=28798881 width=106)
-                                        Output:["_col0","_col1","_col2"]
-                                        Filter Operator [FIL_204] (rows=28798881 width=106)
-                                          predicate:(cr_item_sk is not null and cr_returned_date_sk is not null)
-                                          TableScan [TS_0] (rows=28798881 width=106)
-                                            default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:NONE,Output:["cr_returned_date_sk","cr_item_sk","cr_return_quantity"]
-                                  <-Map 7 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_31]
-                                      PartitionCols:_col0
-                                      Select Operator [SEL_5] (rows=462000 width=1436)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_205] (rows=462000 width=1436)
-                                          predicate:i_item_sk is not null
-                                          TableScan [TS_3] (rows=462000 width=1436)
-                                            default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
-                              <-Reducer 9 [SIMPLE_EDGE]
-                                SHUFFLE [RS_34]
-                                  PartitionCols:_col0
-                                  Merge Join Operator [MERGEJOIN_221] (rows=80353 width=1119)
-                                    Conds:RS_26._col1=RS_27._col0(Inner),Output:["_col0"]
-                                  <-Map 8 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_26]
-                                      PartitionCols:_col1
-                                      Select Operator [SEL_8] (rows=73049 width=1119)
-                                        Output:["_col0","_col1"]
-                                        Filter Operator [FIL_206] (rows=73049 width=1119)
-                                          predicate:d_date_sk is not null
-                                          TableScan [TS_6] (rows=73049 width=1119)
-                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
-                                  <-Reducer 12 [SIMPLE_EDGE]
-                                    SHUFFLE [RS_27]
-                                      PartitionCols:_col0
-                                      Group By Operator [GBY_24] (rows=40176 width=1119)
-                                        Output:["_col0"],keys:KEY._col0
-                                      <-Reducer 11 [SIMPLE_EDGE]
-                                        SHUFFLE [RS_23]
-                                          PartitionCols:_col0
-                                          Group By Operator [GBY_22] (rows=80353 width=1119)
-                                            Output:["_col0"],keys:_col0
-                                            Merge Join Operator [MERGEJOIN_220] (rows=80353 width=1119)
-                                              Conds:RS_18._col1=RS_19._col0(Inner),Output:["_col0"]
-                                            <-Map 10 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_18]
-                                                PartitionCols:_col1
-                                                Select Operator [SEL_10] (rows=73049 width=1119)
-                                                  Output:["_col0","_col1"]
+                        Group By Operator [GBY_38] (rows=34846646 width=106)
+                          Output:["_col0","_col1"],aggregations:["sum(_col2)"],keys:_col4
+                          Select Operator [SEL_37] (rows=34846646 width=106)
+                            Output:["_col4","_col2"]
+                            Merge Join Operator [MERGEJOIN_225] (rows=34846646 width=106)
+                              Conds:RS_34._col0=RS_35._col0(Inner),Output:["_col2","_col4"]
+                            <-Reducer 2 [SIMPLE_EDGE]
+                              SHUFFLE [RS_34]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_216] (rows=31678769 width=106)
+                                  Conds:RS_31._col1=RS_32._col0(Inner),Output:["_col0","_col2","_col4"]
+                                <-Map 1 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_31]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_2] (rows=28798881 width=106)
+                                      Output:["_col0","_col1","_col2"]
+                                      Filter Operator [FIL_201] (rows=28798881 width=106)
+                                        predicate:(cr_item_sk is not null and cr_returned_date_sk is not null)
+                                        TableScan [TS_0] (rows=28798881 width=106)
+                                          default@catalog_returns,catalog_returns,Tbl:COMPLETE,Col:NONE,Output:["cr_returned_date_sk","cr_item_sk","cr_return_quantity"]
+                                <-Map 7 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_32]
+                                    PartitionCols:_col0
+                                    Select Operator [SEL_5] (rows=462000 width=1436)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_202] (rows=462000 width=1436)
+                                        predicate:(i_item_sk is not null and i_item_id is not null)
+                                        TableScan [TS_3] (rows=462000 width=1436)
+                                          default@item,item,Tbl:COMPLETE,Col:NONE,Output:["i_item_sk","i_item_id"]
+                            <-Reducer 9 [SIMPLE_EDGE]
+                              SHUFFLE [RS_35]
+                                PartitionCols:_col0
+                                Merge Join Operator [MERGEJOIN_218] (rows=80353 width=1119)
+                                  Conds:RS_27._col1=RS_28._col0(Inner),Output:["_col0"]
+                                <-Map 8 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_27]
+                                    PartitionCols:_col1
+                                    Select Operator [SEL_8] (rows=73049 width=1119)
+                                      Output:["_col0","_col1"]
+                                      Filter Operator [FIL_203] (rows=73049 width=1119)
+                                        predicate:(d_date is not null and d_date_sk is not null)
+                                        TableScan [TS_6] (rows=73049 width=1119)
+                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date_sk","d_date"]
+                                <-Reducer 12 [SIMPLE_EDGE]
+                                  SHUFFLE [RS_28]
+                                    PartitionCols:_col0
+                                    Group By Operator [GBY_25] (rows=40176 width=1119)
+                                      Output:["_col0"],keys:KEY._col0
+                                    <-Reducer 11 [SIMPLE_EDGE]
+                                      SHUFFLE [RS_24]
+                                        PartitionCols:_col0
+                                        Group By Operator [GBY_23] (rows=80353 width=1119)
+                                          Output:["_col0"],keys:_col0
+                                          Merge Join Operator [MERGEJOIN_217] (rows=80353 width=1119)
+                                            Conds:RS_19._col1=RS_20._col0(Inner),Output:["_col0"]
+                                          <-Map 10 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_19]
+                                              PartitionCols:_col1
+                                              Select Operator [SEL_11] (rows=73049 width=1119)
+                                                Output:["_col0","_col1"]
+                                                Filter Operator [FIL_204] (rows=73049 width=1119)
+                                                  predicate:(d_week_seq is not null and d_date is not null)
                                                   TableScan [TS_9] (rows=73049 width=1119)
                                                     default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
-                                            <-Reducer 14 [SIMPLE_EDGE]
-                                              SHUFFLE [RS_19]
-                                                PartitionCols:_col0
-                                                Group By Operator [GBY_16] (rows=18262 width=1119)
-                                                  Output:["_col0"],keys:KEY._col0
-                                                <-Map 13 [SIMPLE_EDGE]
-                                                  SHUFFLE [RS_15]
-                                                    PartitionCols:_col0
-                                                    Group By Operator [GBY_14] (rows=36525 width=1119)
-                                                      Output:["_col0"],keys:d_week_seq
-                                                      Select Operator [SEL_13] (rows=36525 width=1119)
-                                                        Output:["d_week_seq"]
-                                                        Filter Operator [FIL_208] (rows=36525 width=1119)
-                                                          predicate:(d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10')
-                                                          TableScan [TS_11] (rows=73049 width=1119)
-                                                            default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
+                                          <-Reducer 14 [SIMPLE_EDGE]
+                                            SHUFFLE [RS_20]
+                                              PartitionCols:_col0
+                                              Group By Operator [GBY_17] (rows=18262 width=1119)
+                                                Output:["_col0"],keys:KEY._col0
+                                              <-Map 13 [SIMPLE_EDGE]
+                                                SHUFFLE [RS_16]
+                                                  PartitionCols:_col0
+                                                  Group By Operator [GBY_15] (rows=36525 width=1119)
+                                                    Output:["_col0"],keys:d_week_seq
+                                                    Select Operator [SEL_14] (rows=36525 width=1119)
+                                                      Output:["d_week_seq"]
+                                                      Filter Operator [FIL_205] (rows=36525 width=1119)
+                                                        predicate:((d_date) IN ('1998-01-02', '1998-10-15', '1998-11-10') and d_week_seq is not null)
+                                                        TableScan [TS_12] (rows=73049 width=1119)
+                                                          default@date_dim,date_dim,Tbl:COMPLETE,Col:NONE,Output:["d_date","d_week_seq"]
 

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/position_alias_test_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/position_alias_test_1.q.out b/ql/src/test/results/clientpositive/position_alias_test_1.q.out
index 9053bf1..dc3fb5a 100644
--- a/ql/src/test/results/clientpositive/position_alias_test_1.q.out
+++ b/ql/src/test/results/clientpositive/position_alias_test_1.q.out
@@ -22,6 +22,7 @@ POSTHOOK: query: create table alias_test_03(a INT, b STRING)
 POSTHOOK: type: CREATETABLE
 POSTHOOK: Output: database:default
 POSTHOOK: Output: default@alias_test_03
+Warning: Shuffle Join JOIN[12][tables = [$hdt$_0, $hdt$_1]] in Stage 'Stage-1:MAPRED' is a cross product
 PREHOOK: query: explain
                          select * from
                          alias_test_01 alias01
@@ -47,12 +48,13 @@ POSTHOOK: query: explain
                          on alias01.a = alias03.a
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-1 is a root stage
+  Stage-3 is a root stage
+  Stage-1 depends on stages: Stage-3
   Stage-2 depends on stages: Stage-1
   Stage-0 depends on stages: Stage-2
 
 STAGE PLANS:
-  Stage: Stage-1
+  Stage: Stage-3
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -63,23 +65,23 @@ STAGE PLANS:
               outputColumnNames: b
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
               Group By Operator
-                keys: 2017 (type: int), b (type: string)
+                keys: b (type: string)
                 mode: hash
-                outputColumnNames: _col0, _col1
+                outputColumnNames: _col0
                 Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
                 Reduce Output Operator
-                  key expressions: 2017 (type: int), _col1 (type: string)
-                  sort order: ++
-                  Map-reduce partition columns: 2017 (type: int), _col1 (type: string)
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          keys: 2017 (type: int), KEY._col1 (type: string)
+          keys: KEY._col0 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1
+          outputColumnNames: _col0
           Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
           Select Operator
-            expressions: 2017 (type: int), _col1 (type: string)
+            expressions: 2017 (type: int), _col0 (type: string)
             outputColumnNames: _col0, _col1
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             File Output Operator
@@ -89,56 +91,83 @@ STAGE PLANS:
                   output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-2
+  Stage: Stage-1
     Map Reduce
       Map Operator Tree:
           TableScan
+            alias: alias01
+            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+            Select Operator
+              expressions: a (type: int), b (type: string)
+              outputColumnNames: _col0, _col1
+              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+              Reduce Output Operator
+                sort order: 
+                Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+                value expressions: _col0 (type: int), _col1 (type: string)
+          TableScan
             Reduce Output Operator
-              key expressions: _col0 (type: int)
-              sort order: +
-              Map-reduce partition columns: _col0 (type: int)
+              sort order: 
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-              value expressions: _col1 (type: string)
+              value expressions: _col0 (type: int), _col1 (type: string)
+      Reduce Operator Tree:
+        Join Operator
+          condition map:
+               Left Outer Join0 to 1
+          filter predicates:
+            0 {(VALUE._col0 = 2017)}
+            1 
+          keys:
+            0 
+            1 
+          outputColumnNames: _col0, _col1, _col2, _col3
+          Statistics: Num rows: 1 Data size: 1 Basic stats: COMPLETE Column stats: NONE
+          File Output Operator
+            compressed: false
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
+
+  Stage: Stage-2
+    Map Reduce
+      Map Operator Tree:
           TableScan
-            alias: alias01
-            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             Reduce Output Operator
-              key expressions: a (type: int)
+              key expressions: _col0 (type: int)
               sort order: +
-              Map-reduce partition columns: a (type: int)
-              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-              value expressions: b (type: string)
+              Map-reduce partition columns: _col0 (type: int)
+              Statistics: Num rows: 1 Data size: 1 Basic stats: COMPLETE Column stats: NONE
+              value expressions: _col1 (type: string), _col2 (type: int), _col3 (type: string)
           TableScan
             alias: alias03
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            Reduce Output Operator
-              key expressions: a (type: int)
-              sort order: +
-              Map-reduce partition columns: a (type: int)
+            Select Operator
+              expressions: a (type: int), b (type: string)
+              outputColumnNames: _col0, _col1
               Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-              value expressions: b (type: string)
+              Reduce Output Operator
+                key expressions: _col0 (type: int)
+                sort order: +
+                Map-reduce partition columns: _col0 (type: int)
+                Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
+                value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
                Left Outer Join0 to 1
-               Left Outer Join0 to 2
           keys:
-            0 a (type: int)
+            0 _col0 (type: int)
             1 _col0 (type: int)
-            2 a (type: int)
-          outputColumnNames: _col0, _col1, _col5, _col6, _col7, _col8
-          Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-          Select Operator
-            expressions: _col0 (type: int), _col1 (type: string), _col5 (type: int), _col6 (type: string), _col7 (type: int), _col8 (type: string)
-            outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
-            Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-            File Output Operator
-              compressed: false
-              Statistics: Num rows: 2 Data size: 0 Basic stats: PARTIAL Column stats: NONE
-              table:
-                  input format: org.apache.hadoop.mapred.SequenceFileInputFormat
-                  output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
-                  serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
+          outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5
+          Statistics: Num rows: 1 Data size: 1 Basic stats: COMPLETE Column stats: NONE
+          File Output Operator
+            compressed: false
+            Statistics: Num rows: 1 Data size: 1 Basic stats: COMPLETE Column stats: NONE
+            table:
+                input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+                output format: org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
+                serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 
   Stage: Stage-0
     Fetch Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/62a3778e/ql/src/test/results/clientpositive/ppd_union_view.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/ppd_union_view.q.out b/ql/src/test/results/clientpositive/ppd_union_view.q.out
index c267102..2d11e75 100644
--- a/ql/src/test/results/clientpositive/ppd_union_view.q.out
+++ b/ql/src/test/results/clientpositive/ppd_union_view.q.out
@@ -147,8 +147,6 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1_old
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 14 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -170,8 +168,6 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: t1_mapping
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 12 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -324,8 +320,6 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1_new
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -481,8 +475,6 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1_old
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -504,8 +496,6 @@ STAGE PLANS:
                   auto parallelism: false
           TableScan
             alias: t1_mapping
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
@@ -562,8 +552,6 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1_new
-            properties:
-              insideView TRUE
             Statistics: Num rows: 1 Data size: 11 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Select Operator


Mime
View raw message