Repository: hive
Updated Branches:
  refs/heads/branch-3 e5f7714ac -> bda5d51dd


http://git-wip-us.apache.org/repos/asf/hive/blob/bda5d51d/ql/src/test/results/clientpositive/spark/subquery_views.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/subquery_views.q.out 
b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
index af7ce71..572fe2e 100644
--- a/ql/src/test/results/clientpositive/spark/subquery_views.q.out
+++ b/ql/src/test/results/clientpositive/spark/subquery_views.q.out
@@ -160,19 +160,19 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value > 'val_11') and key is not null) (type: 
boolean)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: ((key < '11') and (value > 'val_11')) (type: 
boolean)
+                    Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       aggregations: count(), count(key)
                       keys: key (type: string), value (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1, _col2, _col3
-                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string)
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string)
-                        Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                         value expressions: _col2 (type: bigint), _col3 (type: 
bigint)
             Execution mode: vectorized
         Map 15 
@@ -181,18 +181,18 @@ STAGE PLANS:
                   alias: a
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                   Filter Operator
-                    predicate: ((value > 'val_11') and key is not null) (type: 
boolean)
-                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                    predicate: ((key < '11') and (value > 'val_11')) (type: 
boolean)
+                    Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string), value (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string), _col1 (type: 
string)
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: string), 
_col1 (type: string)
-                        Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized
         Map 18 
             Map Operator Tree:
@@ -201,20 +201,19 @@ STAGE PLANS:
                   properties:
                     insideView TRUE
                   Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  Select Operator
-                    expressions: key (type: string)
-                    outputColumnNames: key
-                    Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  Filter Operator
+                    predicate: (key < '11') (type: boolean)
+                    Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: key (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
             Execution mode: vectorized
         Reducer 10 
             Execution mode: vectorized
@@ -223,12 +222,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 12 
             Reduce Operator Tree:
               Join Operator
@@ -240,24 +239,24 @@ STAGE PLANS:
                   1 _col0 (type: string), _col1 (type: string)
                   2 _col3 (type: string), _col1 (type: string)
                 outputColumnNames: _col0, _col4, _col5, _col8
-                Statistics: Num rows: 605 Data size: 6426 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 365 Data size: 3878 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
                   predicate: CASE WHEN ((_col4 = 0L)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
-                  Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string)
                     outputColumnNames: _col0
-                    Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col0 (type: string)
                       mode: hash
                       outputColumnNames: _col0
-                      Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: string)
                         sort order: +
                         Map-reduce partition columns: _col0 (type: string)
-                        Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                        Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 14 
             Execution mode: vectorized
             Reduce Operator Tree:
@@ -266,12 +265,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col2 (type: bigint), _col3 (type: bigint)
         Reducer 16 
             Execution mode: vectorized
@@ -280,16 +279,16 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), 
true (type: boolean)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col1 (type: string), _col2 (type: 
boolean)
         Reducer 17 
             Reduce Operator Tree:
@@ -300,12 +299,12 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2, _col3
-                Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col3 (type: string), _col1 (type: string)
                   sort order: ++
                   Map-reduce partition columns: _col3 (type: string), _col1 
(type: string)
-                  Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 91 Data size: 969 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col2 (type: boolean)
         Reducer 19 
             Execution mode: vectorized
@@ -314,12 +313,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0
-                Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
         Reducer 2 
             Reduce Operator Tree:
               Join Operator
@@ -331,19 +330,19 @@ STAGE PLANS:
                   1 _col0 (type: string), _col1 (type: string)
                   2 _col3 (type: string), _col1 (type: string)
                 outputColumnNames: _col0, _col1, _col4, _col5, _col8
-                Statistics: Num rows: 605 Data size: 6426 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 365 Data size: 3878 Basic stats: 
COMPLETE Column stats: NONE
                 Filter Operator
                   predicate: CASE WHEN ((_col4 = 0L)) THEN (true) WHEN (_col4 
is null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
-                  Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string)
                     outputColumnNames: _col0, _col1
-                    Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: string)
                       sort order: +
                       Map-reduce partition columns: _col0 (type: string)
-                      Statistics: Num rows: 302 Data size: 3207 Basic stats: 
COMPLETE Column stats: NONE
+                      Statistics: Num rows: 182 Data size: 1933 Basic stats: 
COMPLETE Column stats: NONE
                       value expressions: _col1 (type: string)
         Reducer 3 
             Reduce Operator Tree:
@@ -354,10 +353,10 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 332 Data size: 3527 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 200 Data size: 2126 Basic stats: 
COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 332 Data size: 3527 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 200 Data size: 2126 Basic stats: 
COMPLETE Column stats: NONE
                   table:
                       input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -370,12 +369,12 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string), _col1 (type: string)
                   sort order: ++
                   Map-reduce partition columns: _col0 (type: string), _col1 
(type: string)
-                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col2 (type: bigint), _col3 (type: bigint)
         Reducer 7 
             Execution mode: vectorized
@@ -384,16 +383,16 @@ STAGE PLANS:
                 keys: KEY._col0 (type: string), KEY._col1 (type: string)
                 mode: mergepartial
                 outputColumnNames: _col0, _col1
-                Statistics: Num rows: 83 Data size: 881 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 Select Operator
                   expressions: _col0 (type: string), _col1 (type: string), 
true (type: boolean)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                   Reduce Output Operator
                     key expressions: _col0 (type: string)
                     sort order: +
                     Map-reduce partition columns: _col0 (type: string)
-                    Statistics: Num rows: 83 Data size: 881 Basic stats: 
COMPLETE Column stats: NONE
+                    Statistics: Num rows: 27 Data size: 286 Basic stats: 
COMPLETE Column stats: NONE
                     value expressions: _col1 (type: string), _col2 (type: 
boolean)
         Reducer 8 
             Reduce Operator Tree:
@@ -404,12 +403,12 @@ STAGE PLANS:
                   0 _col0 (type: string)
                   1 _col0 (type: string)
                 outputColumnNames: _col1, _col2, _col3
-                Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 91 Data size: 969 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
                   key expressions: _col3 (type: string), _col1 (type: string)
                   sort order: ++
                   Map-reduce partition columns: _col3 (type: string), _col1 
(type: string)
-                  Statistics: Num rows: 275 Data size: 2921 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 91 Data size: 969 Basic stats: 
COMPLETE Column stats: NONE
                   value expressions: _col2 (type: boolean)
 
   Stage: Stage-0

http://git-wip-us.apache.org/repos/asf/hive/blob/bda5d51d/ql/src/test/results/clientpositive/subquery_notexists.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_notexists.q.out 
b/ql/src/test/results/clientpositive/subquery_notexists.q.out
index 8b78633..01f7470 100644
--- a/ql/src/test/results/clientpositive/subquery_notexists.q.out
+++ b/ql/src/test/results/clientpositive/subquery_notexists.q.out
@@ -647,8 +647,8 @@ POSTHOOK: Input: default@src
 #### A masked pattern was here ####
 98     val_98
 98     val_98
-Warning: Shuffle Join JOIN[28][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[12][tables = [$hdt$_3, $hdt$_4]] in Stage 
'Stage-6:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_3, $hdt$_4]] in Stage 
'Stage-6:MAPRED' is a cross product
 PREHOOK: query: explain SELECT p1.p_name FROM part p1 LEFT JOIN (select p_type 
as p_col from part ) p2 WHERE NOT EXISTS
                 (select pp1.p_type as p_col from part pp1 where pp1.p_partkey 
= p2.p_col)
 PREHOOK: type: QUERY
@@ -761,18 +761,21 @@ STAGE PLANS:
           TableScan
             alias: part
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: p_type (type: string)
-              outputColumnNames: _col0
+            Filter Operator
+              predicate: p_type is not null (type: boolean)
               Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                sort order: 
+              Select Operator
+                expressions: p_type (type: string)
+                outputColumnNames: _col0
                 Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-                value expressions: _col0 (type: string)
+                Reduce Output Operator
+                  sort order: 
+                  Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col0 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
-               Left Outer Join 0 to 1
+               Inner Join 0 to 1
           keys:
             0 
             1 
@@ -819,15 +822,18 @@ STAGE PLANS:
           TableScan
             alias: pp1
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: p_partkey (type: int)
-              outputColumnNames: _col0
+            Filter Operator
+              predicate: p_partkey is not null (type: boolean)
               Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: UDFToDouble(_col0) (type: double)
-                sort order: +
-                Map-reduce partition columns: UDFToDouble(_col0) (type: double)
+              Select Operator
+                expressions: p_partkey (type: int)
+                outputColumnNames: _col0
                 Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
+                Reduce Output Operator
+                  key expressions: UDFToDouble(_col0) (type: double)
+                  sort order: +
+                  Map-reduce partition columns: UDFToDouble(_col0) (type: 
double)
+                  Statistics: Num rows: 26 Data size: 3147 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             Reduce Output Operator
               key expressions: UDFToDouble(_col0) (type: double)
@@ -889,8 +895,8 @@ STAGE PLANS:
       Processor Tree:
         ListSink
 
-Warning: Shuffle Join JOIN[28][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
-Warning: Shuffle Join JOIN[12][tables = [$hdt$_3, $hdt$_4]] in Stage 
'Stage-6:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[30][tables = [$hdt$_0, $hdt$_1]] in Stage 
'Stage-1:MAPRED' is a cross product
+Warning: Shuffle Join JOIN[14][tables = [$hdt$_3, $hdt$_4]] in Stage 
'Stage-6:MAPRED' is a cross product
 PREHOOK: query: SELECT p1.p_name FROM part p1 LEFT JOIN (select p_type as 
p_col from part ) p2 WHERE NOT EXISTS
                 (select pp1.p_type as p_col from part pp1 where pp1.p_partkey 
= p2.p_col)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/bda5d51d/ql/src/test/results/clientpositive/subquery_notin_having.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_notin_having.q.out 
b/ql/src/test/results/clientpositive/subquery_notin_having.q.out
index 4244eb0..c062159 100644
--- a/ql/src/test/results/clientpositive/subquery_notin_having.q.out
+++ b/ql/src/test/results/clientpositive/subquery_notin_having.q.out
@@ -335,15 +335,15 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col3, _col4, _col7
           Statistics: Num rows: 15 Data size: 1903 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (not CASE WHEN ((_col3 = 0L)) THEN (false) WHEN (_col3 
is null) THEN (false) WHEN (_col7 is not null) THEN (true) WHEN (_col0 is null) 
THEN (null) WHEN ((_col4 < _col3)) THEN (true) ELSE (false) END) (type: boolean)
-            Statistics: Num rows: 8 Data size: 1014 Basic stats: COMPLETE 
Column stats: NONE
+            predicate: CASE WHEN ((_col3 = 0L)) THEN (true) WHEN (_col3 is 
null) THEN (true) WHEN (_col7 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col4 < _col3)) THEN (false) ELSE (true) END (type: boolean)
+            Statistics: Num rows: 7 Data size: 888 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: string), _col1 (type: double)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 8 Data size: 1014 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 7 Data size: 888 Basic stats: COMPLETE 
Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 8 Data size: 1014 Basic stats: COMPLETE 
Column stats: NONE
+                Statistics: Num rows: 7 Data size: 888 Basic stats: COMPLETE 
Column stats: NONE
                 table:
                     input format: 
org.apache.hadoop.mapred.SequenceFileInputFormat
                     output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
@@ -430,9 +430,8 @@ STAGE PLANS:
           TableScan
             alias: part
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: p_mfgr (type: string), p_retailprice (type: double)
-              outputColumnNames: p_mfgr, p_retailprice
+            Filter Operator
+              predicate: p_mfgr is not null (type: boolean)
               Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 aggregations: min(p_retailprice), max(p_retailprice)
@@ -458,22 +457,15 @@ STAGE PLANS:
             predicate: (((_col2 - _col1) > 600.0D) and _col1 is not null) 
(type: boolean)
             Statistics: Num rows: 4 Data size: 484 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
-              expressions: _col0 (type: string), _col1 (type: double)
-              outputColumnNames: _col0, _col1
+              expressions: _col0 (type: string), _col1 (type: double), true 
(type: boolean)
+              outputColumnNames: _col0, _col1, _col2
               Statistics: Num rows: 4 Data size: 484 Basic stats: COMPLETE 
Column stats: NONE
-              Filter Operator
-                predicate: _col0 is not null (type: boolean)
-                Statistics: Num rows: 4 Data size: 484 Basic stats: COMPLETE 
Column stats: NONE
-                Select Operator
-                  expressions: _col0 (type: string), _col1 (type: double), 
true (type: boolean)
-                  outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 4 Data size: 484 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
+              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-0
     Fetch Operator
@@ -1117,7 +1109,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col2, _col3, _col5
           Statistics: Num rows: 4 Data size: 343 Basic stats: COMPLETE Column 
stats: NONE
           Filter Operator
-            predicate: (not CASE WHEN ((_col2 = 0L)) THEN (false) WHEN (_col2 
is null) THEN (false) WHEN (_col5 is not null) THEN (true) WHEN (_col0 is null) 
THEN (null) WHEN ((_col3 < _col2)) THEN (true) ELSE (false) END) (type: boolean)
+            predicate: CASE WHEN ((_col2 = 0L)) THEN (true) WHEN (_col2 is 
null) THEN (true) WHEN (_col5 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col3 < _col2)) THEN (false) ELSE (true) END (type: boolean)
             Statistics: Num rows: 2 Data size: 171 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col0 (type: int)
@@ -1242,9 +1234,8 @@ STAGE PLANS:
           TableScan
             alias: t1_n145
             Statistics: Num rows: 4 Data size: 313 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: c1 (type: int)
-              outputColumnNames: c1
+            Filter Operator
+              predicate: c1 is not null (type: boolean)
               Statistics: Num rows: 4 Data size: 313 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
                 keys: c1 (type: int)

http://git-wip-us.apache.org/repos/asf/hive/blob/bda5d51d/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out 
b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
index ee40b0f..e744d0f 100644
--- a/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
+++ b/ql/src/test/results/clientpositive/subquery_unqualcolumnrefs.q.out
@@ -440,7 +440,7 @@ STAGE PLANS:
           outputColumnNames: _col0, _col1, _col2, _col4, _col5, _col8
           Statistics: Num rows: 30 Data size: 3807 Basic stats: COMPLETE 
Column stats: NONE
           Filter Operator
-            predicate: (not CASE WHEN ((_col4 = 0L)) THEN (false) WHEN (_col4 
is null) THEN (false) WHEN (_col8 is not null) THEN (true) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (true) ELSE (false) END) (type: boolean)
+            predicate: CASE WHEN ((_col4 = 0L)) THEN (true) WHEN (_col4 is 
null) THEN (true) WHEN (_col8 is not null) THEN (false) WHEN (_col0 is null) 
THEN (null) WHEN ((_col5 < _col4)) THEN (false) ELSE (true) END (type: boolean)
             Statistics: Num rows: 15 Data size: 1903 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: _col1 (type: string), _col0 (type: string), _col2 
(type: int)
@@ -498,7 +498,7 @@ STAGE PLANS:
                         isPivotResult: true
             Statistics: Num rows: 26 Data size: 3147 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (rank_window_0 <= 2) (type: boolean)
+              predicate: ((rank_window_0 <= 2) and _col1 is not null) (type: 
boolean)
               Statistics: Num rows: 8 Data size: 968 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: _col1 (type: string), _col2 (type: string)
@@ -532,19 +532,16 @@ STAGE PLANS:
           mode: mergepartial
           outputColumnNames: _col0, _col1
           Statistics: Num rows: 4 Data size: 484 Basic stats: COMPLETE Column 
stats: NONE
-          Filter Operator
-            predicate: _col0 is not null (type: boolean)
+          Select Operator
+            expressions: _col0 (type: string), _col1 (type: string), true 
(type: boolean)
+            outputColumnNames: _col0, _col1, _col2
             Statistics: Num rows: 4 Data size: 484 Basic stats: COMPLETE 
Column stats: NONE
-            Select Operator
-              expressions: _col0 (type: string), _col1 (type: string), true 
(type: boolean)
-              outputColumnNames: _col0, _col1, _col2
-              Statistics: Num rows: 4 Data size: 484 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
+            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-0
     Fetch Operator

Reply via email to