Modified: hive/trunk/ql/src/test/results/clientpositive/explain_dependency.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_dependency.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_dependency.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_dependency.q.out Sun 
Nov 23 05:59:20 2014
@@ -95,7 +95,7 @@ PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN DEPENDENCY 
   SELECT S1.key, S2.value FROM src S1 JOIN srcpart S2 ON S1.key = S2.key WHERE 
ds IS NOT NULL
 POSTHOOK: type: QUERY
-{"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"},{"tablename":"default@src","tabletype":"MANAGED_TABLE"}]}
+{"input_partitions":[{"partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@src","tabletype":"MANAGED_TABLE"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE"}]}
 PREHOOK: query: -- With views
 EXPLAIN DEPENDENCY SELECT * FROM V1
 PREHOOK: type: QUERY
@@ -112,12 +112,12 @@ PREHOOK: query: EXPLAIN DEPENDENCY SELEC
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V3
 POSTHOOK: type: QUERY
-{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v3","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v3]"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v3]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]}
+{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v3","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v3]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v3]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]}
 PREHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN DEPENDENCY SELECT * FROM V4
 POSTHOOK: type: QUERY
-{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v4","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v4,
 
default@v1]"},{"tablename":"default@v1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]}
+{"input_partitions":[{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-08/hr=12"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=11"},{"partitionParents":"[default@v2]","partitionName":"default@srcpart@ds=2008-04-09/hr=12"}],"input_tables":[{"tablename":"default@v4","tabletype":"VIRTUAL_VIEW"},{"tablename":"default@v1","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@v2","tabletype":"VIRTUAL_VIEW","tableParents":"[default@v4]"},{"tablename":"default@src","tabletype":"MANAGED_TABLE","tableParents":"[default@v4,
 
default@v1]"},{"tablename":"default@srcpart","tabletype":"MANAGED_TABLE","tableParents":"[default@v2]"}]}
 PREHOOK: query: -- The table should show up in the explain dependency even if 
none
 -- of the partitions are selected.
 CREATE VIEW V5 as SELECT * FROM srcpart where ds = '10'

Modified: hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_logical.q.out Sun Nov 
23 05:59:20 2014
@@ -370,10 +370,10 @@ TOK_QUERY
 
 LOGICAL PLAN:
 s1 
-  TableScan (TS_1)
+  TableScan (TS_0)
     alias: s1
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_11)
+    Filter Operator (FIL_10)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
       Reduce Output Operator (RS_3)
@@ -401,10 +401,10 @@ s1 
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 s2 
-  TableScan (TS_0)
+  TableScan (TS_1)
     alias: s2
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_10)
+    Filter Operator (FIL_11)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column 
stats: NONE
       Reduce Output Operator (RS_5)
@@ -511,7 +511,7 @@ v3:src1:srcpart 
   TableScan (TS_0)
     alias: srcpart
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_14)
+    Filter Operator (FIL_13)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column 
stats: NONE
       Select Operator (SEL_2)
@@ -546,7 +546,7 @@ v3:src2 
   TableScan (TS_3)
     alias: src2
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_13)
+    Filter Operator (FIL_14)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
       Reduce Output Operator (RS_7)
@@ -586,13 +586,13 @@ TOK_QUERY
 
 LOGICAL PLAN:
 v4:src1:src 
-  TableScan (TS_3)
+  TableScan (TS_0)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
     Filter Operator (FIL_16)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
-      Select Operator (SEL_4)
+      Select Operator (SEL_1)
         expressions: key (type: string)
         outputColumnNames: _col0
         Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
@@ -623,13 +623,13 @@ v4:src1:src 
                     output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                     serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
 v4:src2:srcpart 
-  TableScan (TS_0)
+  TableScan (TS_2)
     alias: srcpart
     Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_18)
+    Filter Operator (FIL_17)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column 
stats: NONE
-      Select Operator (SEL_2)
+      Select Operator (SEL_4)
         expressions: key (type: string), value (type: string)
         outputColumnNames: _col1, _col2
         Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
@@ -653,7 +653,7 @@ v4:src3 
   TableScan (TS_5)
     alias: src3
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_17)
+    Filter Operator (FIL_18)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
       Reduce Output Operator (RS_11)
@@ -800,7 +800,7 @@ s1:src 
   TableScan (TS_0)
     alias: src
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_17)
+    Filter Operator (FIL_16)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
       Group By Operator (GBY_2)
@@ -859,7 +859,7 @@ s2 
   TableScan (TS_6)
     alias: s2
     Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column 
stats: NONE
-    Filter Operator (FIL_16)
+    Filter Operator (FIL_17)
       predicate: key is not null (type: boolean)
       Statistics: Num rows: 250 Data size: 2656 Basic stats: COMPLETE Column 
stats: NONE
       Reduce Output Operator (RS_10)

Modified: hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/explain_rearrange.q.out Sun 
Nov 23 05:59:20 2014
@@ -60,15 +60,15 @@ order by src1.key, src1.cnt1, src2.cnt1
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage [MAPRED]
-  Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, 
Stage-11, Stage-3 [CONDITIONAL]
-  Stage-10 has a backup stage: Stage-3 [MAPREDLOCAL]
+  Stage-9 depends on stages: Stage-1, Stage-5 , consists of Stage-10, 
Stage-11, Stage-2 [CONDITIONAL]
+  Stage-10 has a backup stage: Stage-2 [MAPREDLOCAL]
   Stage-7 depends on stages: Stage-10 [MAPRED]
-  Stage-4 depends on stages: Stage-3, Stage-7, Stage-8 [MAPRED]
-  Stage-11 has a backup stage: Stage-3 [MAPREDLOCAL]
+  Stage-3 depends on stages: Stage-2, Stage-7, Stage-8 [MAPRED]
+  Stage-11 has a backup stage: Stage-2 [MAPREDLOCAL]
   Stage-8 depends on stages: Stage-11 [MAPRED]
-  Stage-3 [MAPRED]
+  Stage-2 [MAPRED]
   Stage-5 is a root stage [MAPRED]
-  Stage-0 depends on stages: Stage-4 [FETCH]
+  Stage-0 depends on stages: Stage-3 [FETCH]
 
 STAGE PLANS:
   Stage: Stage-1
@@ -159,7 +159,7 @@ STAGE PLANS:
       Local Work:
         Map Reduce Local Work
 
-  Stage: Stage-4
+  Stage: Stage-3
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -220,7 +220,7 @@ STAGE PLANS:
       Local Work:
         Map Reduce Local Work
 
-  Stage: Stage-3
+  Stage: Stage-2
     Map Reduce
       Map Operator Tree:
           TableScan

Modified: hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/groupby_ppd.q.out Sun Nov 23 
05:59:20 2014
@@ -21,7 +21,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: d
+            alias: c
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
               predicate: (bar = 1) (type: boolean)
@@ -47,7 +47,7 @@ STAGE PLANS:
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: int)
                         Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
           TableScan
-            alias: c
+            alias: d
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
               predicate: (bar = 1) (type: boolean)

Modified: 
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables.q.out 
Sun Nov 23 05:59:20 2014
@@ -19,17 +19,6 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
-              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: key (type: string)
-                sort order: +
-                Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-          TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
@@ -41,6 +30,17 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: string)
+          TableScan
+            alias: b
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
+            Filter Operator
+              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
+              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -203,10 +203,10 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default.default__srcpart_srcpart_index__
-            filterExpr: (((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+            alias: default.default__src_src_index__
+            filterExpr: (((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
-              predicate: (((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+              predicate: (((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offset (type: bigint)
                 outputColumnNames: _col0, _col1
@@ -246,18 +246,6 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
-            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
-              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: key (type: string)
-                sort order: +
-                Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-          TableScan
             alias: a
             filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -270,6 +258,18 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: string)
+          TableScan
+            alias: b
+            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
+            Filter Operator
+              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
+              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -295,10 +295,10 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default.default__src_src_index__
-            filterExpr: (((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+            alias: default.default__srcpart_srcpart_index__
+            filterExpr: (((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
-              predicate: (((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+              predicate: (((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) and (not EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offset (type: bigint)
                 outputColumnNames: _col0, _col1

Modified: 
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- 
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
 (original)
+++ 
hive/trunk/ql/src/test/results/clientpositive/index_auto_mult_tables_compact.q.out
 Sun Nov 23 05:59:20 2014
@@ -19,17 +19,6 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
-              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: key (type: string)
-                sort order: +
-                Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-          TableScan
             alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
@@ -41,6 +30,17 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: string)
+          TableScan
+            alias: b
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
+            Filter Operator
+              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
+              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -213,10 +213,10 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default.default__srcpart_srcpart_index__
-            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
+            alias: default.default__src_src_index__
+            filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
             Filter Operator
-              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
+              predicate: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
                 outputColumnNames: _col0, _col1
@@ -246,18 +246,6 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
-            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
-            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
-              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: key (type: string)
-                sort order: +
-                Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
-          TableScan
             alias: a
             filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -270,6 +258,18 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 6 Data size: 63 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: value (type: string)
+          TableScan
+            alias: b
+            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
+            Statistics: Num rows: 2000 Data size: 21248 Basic stats: COMPLETE 
Column stats: NONE
+            Filter Operator
+              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
+              Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 24 Data size: 254 Basic stats: COMPLETE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -323,10 +323,10 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: default.default__src_src_index__
-            filterExpr: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
+            alias: default.default__srcpart_srcpart_index__
+            filterExpr: ((((key > 70) and (key < 90)) and (key > 80)) and (key 
< 100)) (type: boolean)
             Filter Operator
-              predicate: ((((key > 80) and (key < 100)) and (key > 70)) and 
(key < 90)) (type: boolean)
+              predicate: ((((key > 70) and (key < 90)) and (key > 80)) and 
(key < 100)) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offsets (type: 
array<bigint>)
                 outputColumnNames: _col0, _col1

Modified: 
hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/index_auto_self_join.q.out 
Sun Nov 23 05:59:20 2014
@@ -17,10 +17,10 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
+            alias: a
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
+              predicate: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: value (type: string)
@@ -29,10 +29,10 @@ STAGE PLANS:
                 Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: key (type: string)
           TableScan
-            alias: a
+            alias: b
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
+              predicate: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: value (type: string)
@@ -124,9 +124,9 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default.default__src_src_index__
-            filterExpr: (((key > 70) and (key < 90)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+            filterExpr: (((key > 80) and (key < 100)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
-              predicate: (((key > 70) and (key < 90)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+              predicate: (((key > 80) and (key < 100)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offset (type: bigint)
                 outputColumnNames: _col0, _col1
@@ -166,11 +166,11 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: b
-            filterExpr: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
+            alias: a
+            filterExpr: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
+              predicate: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: value (type: string)
@@ -179,11 +179,11 @@ STAGE PLANS:
                 Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
                 value expressions: key (type: string)
           TableScan
-            alias: a
-            filterExpr: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
+            alias: b
+            filterExpr: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((value is not null and (key > 80)) and (key < 100)) 
(type: boolean)
+              predicate: ((value is not null and (key > 70)) and (key < 90)) 
(type: boolean)
               Statistics: Num rows: 27 Data size: 286 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: value (type: string)
@@ -217,9 +217,9 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: default.default__src_src_index__
-            filterExpr: (((key > 80) and (key < 100)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+            filterExpr: (((key > 70) and (key < 90)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
             Filter Operator
-              predicate: (((key > 80) and (key < 100)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
+              predicate: (((key > 70) and (key < 90)) and (not 
EWAH_BITMAP_EMPTY(_bitmaps))) (type: boolean)
               Select Operator
                 expressions: _bucketname (type: string), _offset (type: bigint)
                 outputColumnNames: _col0, _col1

Modified: hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort.q.out Sun 
Nov 23 05:59:20 2014
@@ -354,7 +354,7 @@ SELECT a.key, c.value FROM src a JOIN sr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_table@part=1
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE 
[(src)a.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION 
[(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE 
[(src)c.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
 PREHOOK: type: DESCTABLE

Modified: 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
 (original)
+++ 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_map_operators.q.out
 Sun Nov 23 05:59:20 2014
@@ -377,13 +377,13 @@ SELECT /*+ MAPJOIN(a) */ a.key, b.value 
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
-  Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
-  Stage-4
-  Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
-  Stage-2 depends on stages: Stage-0
-  Stage-3
+  Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
   Stage-5
-  Stage-6 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-5, Stage-4, Stage-7
+  Stage-3 depends on stages: Stage-0
+  Stage-4
+  Stage-6
+  Stage-7 depends on stages: Stage-6
 
 STAGE PLANS:
   Stage: Stage-1
@@ -416,10 +416,10 @@ STAGE PLANS:
                         serde: 
org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                         name: default.test_table_out
 
-  Stage: Stage-7
+  Stage: Stage-8
     Conditional Operator
 
-  Stage: Stage-4
+  Stage: Stage-5
     Move Operator
       files:
           hdfs directory: true
@@ -437,10 +437,10 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.test_table_out
 
-  Stage: Stage-2
+  Stage: Stage-3
     Stats-Aggr Operator
 
-  Stage: Stage-3
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -452,7 +452,7 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.test_table_out
 
-  Stage: Stage-5
+  Stage: Stage-6
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -464,7 +464,7 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.test_table_out
 
-  Stage: Stage-6
+  Stage: Stage-7
     Move Operator
       files:
           hdfs directory: true
@@ -538,7 +538,7 @@ POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-1 is a root stage
   Stage-0 depends on stages: Stage-1
-  Stage-2 depends on stages: Stage-0
+  Stage-3 depends on stages: Stage-0
 
 STAGE PLANS:
   Stage: Stage-1
@@ -596,7 +596,7 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.test_table_out
 
-  Stage: Stage-2
+  Stage: Stage-3
     Stats-Aggr Operator
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1')

Modified: 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
 (original)
+++ 
hive/trunk/ql/src/test/results/clientpositive/infer_bucket_sort_reducers_power_two.q.out
 Sun Nov 23 05:59:20 2014
@@ -246,7 +246,7 @@ SELECT a.key, c.value FROM src a JOIN sr
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src
 POSTHOOK: Output: default@test_table@part=1
-POSTHOOK: Lineage: test_table PARTITION(part=1).key SIMPLE 
[(src)a.FieldSchema(name:key, type:string, comment:default), ]
+POSTHOOK: Lineage: test_table PARTITION(part=1).key EXPRESSION 
[(src)a.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: test_table PARTITION(part=1).value SIMPLE 
[(src)c.FieldSchema(name:value, type:string, comment:default), ]
 PREHOOK: query: DESCRIBE FORMATTED test_table PARTITION (part = '1')
 PREHOOK: type: DESCTABLE

Modified: hive/trunk/ql/src/test/results/clientpositive/innerjoin.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/innerjoin.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/innerjoin.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/innerjoin.q.out Sun Nov 23 
05:59:20 2014
@@ -28,7 +28,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -38,9 +38,8 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                value expressions: value (type: string)
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -50,6 +49,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -1184,15 +1184,6 @@ STAGE PLANS:
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Reduce Output Operator
-              key expressions: key (type: string)
-              sort order: +
-              Map-reduce partition columns: key (type: string)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-              value expressions: value (type: string)
-          TableScan
-            alias: src
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: _col0, _col1
@@ -1203,6 +1194,15 @@ STAGE PLANS:
                 Map-reduce partition columns: _col0 (type: string)
                 Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: _col1 (type: string)
+          TableScan
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            Reduce Output Operator
+              key expressions: key (type: string)
+              sort order: +
+              Map-reduce partition columns: key (type: string)
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/input39.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/input39.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/input39.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/input39.q.out Sun Nov 23 
05:59:20 2014
@@ -72,7 +72,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: t2
+            alias: t1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((hash(rand(460476415)) & 2147483647) % 32) = 0) 
and key is not null) (type: boolean)
@@ -83,7 +83,7 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 125 Data size: 1328 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
-            alias: t1
+            alias: t2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: ((((hash(rand(460476415)) & 2147483647) % 32) = 0) 
and key is not null) (type: boolean)

Modified: hive/trunk/ql/src/test/results/clientpositive/join1.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join1.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join1.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join1.q.out Sun Nov 23 
05:59:20 2014
@@ -24,7 +24,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -34,9 +34,8 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                value expressions: value (type: string)
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -46,6 +45,7 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join11.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join11.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join11.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join11.q.out Sun Nov 23 
05:59:20 2014
@@ -29,15 +29,14 @@ STAGE PLANS:
               predicate: (key < 100) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
+                expressions: key (type: string)
+                outputColumnNames: _col0
                 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: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: string)
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -45,14 +44,15 @@ STAGE PLANS:
               predicate: (key < 100) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string)
-                outputColumnNames: _col0
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 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: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join12.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join12.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join12.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join12.q.out Sun Nov 23 
05:59:20 2014
@@ -32,33 +32,33 @@ STAGE PLANS:
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (((key < 100) and (key < 80)) and key is not null) 
(type: boolean)
-              Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: ((key < 80) and (key < 100)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE 
Column stats: NONE
+                expressions: key (type: string)
+                outputColumnNames: _col0
+                Statistics: Num rows: 55 Data size: 584 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: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: string)
+                  Statistics: Num rows: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key < 80) and (key < 100)) (type: boolean)
-              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (((key < 100) and (key < 80)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 28 Data size: 297 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string)
-                outputColumnNames: _col0
-                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 28 Data size: 297 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: 55 Data size: 584 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 28 Data size: 297 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: string)
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE

Modified: hive/trunk/ql/src/test/results/clientpositive/join13.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join13.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join13.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join13.q.out Sun Nov 23 
05:59:20 2014
@@ -36,15 +36,14 @@ STAGE PLANS:
               predicate: (key < 100) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string), value (type: string)
-                outputColumnNames: _col0, _col1
+                expressions: key (type: string)
+                outputColumnNames: _col0
                 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: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: string)
           TableScan
             alias: src
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
@@ -52,14 +51,15 @@ STAGE PLANS:
               predicate: (key < 100) (type: boolean)
               Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
-                expressions: key (type: string)
-                outputColumnNames: _col0
+                expressions: key (type: string), value (type: string)
+                outputColumnNames: _col0, _col1
                 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: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join14.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join14.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join14.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join14.q.out Sun Nov 23 
05:59:20 2014
@@ -28,28 +28,28 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: srcpart
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
+            alias: src
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: ((key > 100) and key is not null) (type: boolean)
-              Statistics: Num rows: 167 Data size: 1774 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: (key > 100) (type: boolean)
+              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
                 sort order: +
                 Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 167 Data size: 1774 Basic stats: 
COMPLETE Column stats: NONE
-                value expressions: value (type: string)
+                Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
-            alias: src
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            alias: srcpart
+            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
-              predicate: (key > 100) (type: boolean)
-              Statistics: Num rows: 166 Data size: 1763 Basic stats: COMPLETE 
Column stats: NONE
+              predicate: ((key > 100) and key is not null) (type: boolean)
+              Statistics: Num rows: 167 Data size: 1774 Basic stats: COMPLETE 
Column stats: NONE
               Reduce Output Operator
                 key expressions: key (type: string)
                 sort order: +
                 Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
+                Statistics: Num rows: 167 Data size: 1774 Basic stats: 
COMPLETE Column stats: NONE
+                value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join15.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join15.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join15.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join15.q.out Sun Nov 23 
05:59:20 2014
@@ -14,7 +14,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -26,7 +26,7 @@ STAGE PLANS:
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)

Modified: hive/trunk/ql/src/test/results/clientpositive/join17.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join17.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join17.q.out (original) and 
hive/trunk/ql/src/test/results/clientpositive/join17.q.out Sun Nov 23 05:59:20 
2014 differ

Modified: hive/trunk/ql/src/test/results/clientpositive/join18.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join18.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join18.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join18.q.out Sun Nov 23 
05:59:20 2014
@@ -35,30 +35,31 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
-            Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+            alias: src1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(DISTINCT value)
-                keys: key (type: string), value (type: string)
+                aggregations: count(value)
+                keys: key (type: string)
                 mode: hash
-                outputColumnNames: _col0, _col1, _col2
-                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string)
-                  sort order: ++
+                  key expressions: _col0 (type: string)
+                  sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations: count(DISTINCT KEY._col1:0._col0)
+          aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -74,14 +75,14 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint)
           TableScan
             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: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Join Operator
@@ -108,31 +109,30 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src1
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            alias: src2
+            Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(value)
-                keys: key (type: string)
+                aggregations: count(DISTINCT value)
+                keys: key (type: string), value (type: string)
                 mode: hash
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                outputColumnNames: _col0, _col1, _col2
+                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                  key expressions: _col0 (type: string), _col1 (type: string)
+                  sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: bigint)
+                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          aggregations: count(VALUE._col0)
+          aggregations: count(DISTINCT KEY._col1:0._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+          Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:

Modified: 
hive/trunk/ql/src/test/results/clientpositive/join18_multi_distinct.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join18_multi_distinct.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join18_multi_distinct.q.out 
(original)
+++ hive/trunk/ql/src/test/results/clientpositive/join18_multi_distinct.q.out 
Sun Nov 23 05:59:20 2014
@@ -41,30 +41,31 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
-            Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+            alias: src1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(DISTINCT value), count(DISTINCT key)
-                keys: key (type: string), value (type: string)
+                aggregations: count(value)
+                keys: key (type: string)
                 mode: hash
-                outputColumnNames: _col0, _col1, _col2, _col3
-                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+                outputColumnNames: _col0, _col1
+                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string), _col1 (type: string)
-                  sort order: ++
+                  key expressions: _col0 (type: string)
+                  sort order: +
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
+                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                  value expressions: _col1 (type: bigint)
       Reduce Operator Tree:
         Group By Operator
-          aggregations: count(DISTINCT KEY._col1:0._col0), count(DISTINCT 
KEY._col1:1._col0)
+          aggregations: count(VALUE._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1, _col2
-          Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column 
stats: NONE
+          outputColumnNames: _col0, _col1
+          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
           File Output Operator
             compressed: false
             table:
@@ -80,15 +81,15 @@ STAGE PLANS:
               key expressions: _col0 (type: string)
               sort order: +
               Map-reduce partition columns: _col0 (type: string)
-              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
-              value expressions: _col1 (type: bigint), _col2 (type: bigint)
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: _col1 (type: bigint)
           TableScan
             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
-              value expressions: _col1 (type: bigint)
+              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: _col1 (type: bigint), _col2 (type: bigint)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -114,31 +115,30 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src1
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            alias: src2
+            Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
             Select Operator
               expressions: key (type: string), value (type: string)
               outputColumnNames: key, value
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
               Group By Operator
-                aggregations: count(value)
-                keys: key (type: string)
+                aggregations: count(DISTINCT value), count(DISTINCT key)
+                keys: key (type: string), value (type: string)
                 mode: hash
-                outputColumnNames: _col0, _col1
-                Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
+                outputColumnNames: _col0, _col1, _col2, _col3
+                Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE 
Column stats: NONE
                 Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
+                  key expressions: _col0 (type: string), _col1 (type: string)
+                  sort order: ++
                   Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 500 Data size: 5312 Basic stats: 
COMPLETE Column stats: NONE
-                  value expressions: _col1 (type: bigint)
+                  Statistics: Num rows: 25 Data size: 191 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
-          aggregations: count(VALUE._col0)
+          aggregations: count(DISTINCT KEY._col1:0._col0), count(DISTINCT 
KEY._col1:1._col0)
           keys: KEY._col0 (type: string)
           mode: mergepartial
-          outputColumnNames: _col0, _col1
-          Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+          outputColumnNames: _col0, _col1, _col2
+          Statistics: Num rows: 25 Data size: 191 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
             table:

Modified: hive/trunk/ql/src/test/results/clientpositive/join19.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join19.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join19.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join19.q.out Sun Nov 23 
05:59:20 2014
@@ -119,16 +119,31 @@ t6.predicate='http://sofa.semanticweb.or
 ON (t66.subject=t55.object)
 POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
-  Stage-2 is a root stage
+  Stage-1 is a root stage
+  Stage-2 depends on stages: Stage-1
   Stage-3 depends on stages: Stage-2
-  Stage-1 depends on stages: Stage-3
-  Stage-0 depends on stages: Stage-1
+  Stage-0 depends on stages: Stage-3
 
 STAGE PLANS:
-  Stage: Stage-2
+  Stage: Stage-1
     Map Reduce
       Map Operator Tree:
           TableScan
+            alias: t1
+            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Filter Operator
+              predicate: (((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Citation')) and subject is not 
null) (type: boolean)
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Select Operator
+                expressions: subject (type: string)
+                outputColumnNames: _col0
+                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Reduce Output Operator
+                  key expressions: _col0 (type: string)
+                  sort order: +
+                  Map-reduce partition columns: _col0 (type: string)
+                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+          TableScan
             alias: t2
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
@@ -160,21 +175,6 @@ STAGE PLANS:
                   Map-reduce partition columns: _col1 (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
                   value expressions: _col0 (type: string)
-          TableScan
-            alias: t1
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
-            Filter Operator
-              predicate: (((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Citation')) and subject is not 
null) (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
-              Select Operator
-                expressions: subject (type: string)
-                outputColumnNames: _col0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
-                Reduce Output Operator
-                  key expressions: _col0 (type: string)
-                  sort order: +
-                  Map-reduce partition columns: _col0 (type: string)
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -193,7 +193,7 @@ STAGE PLANS:
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-3
+  Stage: Stage-2
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -204,36 +204,36 @@ STAGE PLANS:
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
               value expressions: _col0 (type: string), _col2 (type: string)
           TableScan
-            alias: t5
+            alias: t4
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
-              predicate: (((predicate = 
'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null) 
and object is not null) (type: boolean)
+              predicate: (((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Author')) and subject is not 
null) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
               Select Operator
-                expressions: subject (type: string), object (type: string)
-                outputColumnNames: _col0, _col1
+                expressions: subject (type: string)
+                outputColumnNames: _col0
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
-                  value expressions: _col1 (type: string)
           TableScan
-            alias: t4
+            alias: t5
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
-              predicate: (((predicate = 
'http://sofa.semanticweb.org/sofa/v1.0/system#__INSTANCEOF_REL') and (object = 
'http://ontos/OntosMiner/Common.English/ontology#Author')) and subject is not 
null) (type: boolean)
+              predicate: (((predicate = 
'http://www.ontosearch.com/2007/12/ontosofa-ns#_to') and subject is not null) 
and object is not null) (type: boolean)
               Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
               Select Operator
-                expressions: subject (type: string)
-                outputColumnNames: _col0
+                expressions: subject (type: string), object (type: string)
+                outputColumnNames: _col0, _col1
                 Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
                 Reduce Output Operator
                   key expressions: _col0 (type: string)
                   sort order: +
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  value expressions: _col1 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -252,10 +252,17 @@ STAGE PLANS:
                 output format: 
org.apache.hadoop.hive.ql.io.HiveSequenceFileOutputFormat
                 serde: org.apache.hadoop.hive.serde2.lazybinary.LazyBinarySerDe
 
-  Stage: Stage-1
+  Stage: Stage-3
     Map Reduce
       Map Operator Tree:
           TableScan
+            Reduce Output Operator
+              key expressions: _col7 (type: string)
+              sort order: +
+              Map-reduce partition columns: _col7 (type: string)
+              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              value expressions: _col0 (type: string), _col2 (type: string), 
_col3 (type: string)
+          TableScan
             alias: t6
             Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
             Filter Operator
@@ -271,13 +278,6 @@ STAGE PLANS:
                   Map-reduce partition columns: _col0 (type: string)
                   Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
                   value expressions: _col1 (type: string)
-          TableScan
-            Reduce Output Operator
-              key expressions: _col7 (type: string)
-              sort order: +
-              Map-reduce partition columns: _col7 (type: string)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
-              value expressions: _col0 (type: string), _col2 (type: string), 
_col3 (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join2.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join2.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join2.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join2.q.out Sun Nov 23 
05:59:20 2014
@@ -25,7 +25,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -36,7 +36,7 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)

Modified: hive/trunk/ql/src/test/results/clientpositive/join20.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join20.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join20.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join20.q.out Sun Nov 23 
05:59:20 2014
@@ -16,7 +16,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 10) (type: boolean)
@@ -28,16 +28,7 @@ STAGE PLANS:
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
           TableScan
-            alias: src3
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Reduce Output Operator
-              key expressions: key (type: string)
-              sort order: +
-              Map-reduce partition columns: key (type: string)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-              value expressions: value (type: string)
-          TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 10) (type: boolean)
@@ -48,6 +39,15 @@ STAGE PLANS:
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: value (type: string)
+          TableScan
+            alias: src3
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            Reduce Output Operator
+              key expressions: key (type: string)
+              sort order: +
+              Map-reduce partition columns: key (type: string)
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:
@@ -677,6 +677,18 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
+            alias: src1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            Filter Operator
+              predicate: ((key < 15) and (key < 10)) (type: boolean)
+              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
+              Reduce Output Operator
+                key expressions: key (type: string)
+                sort order: +
+                Map-reduce partition columns: key (type: string)
+                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
+                value expressions: value (type: string)
+          TableScan
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
@@ -697,18 +709,6 @@ STAGE PLANS:
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: value (type: string)
-          TableScan
-            alias: src1
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Filter Operator
-              predicate: ((key < 15) and (key < 10)) (type: boolean)
-              Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-              Reduce Output Operator
-                key expressions: key (type: string)
-                sort order: +
-                Map-reduce partition columns: key (type: string)
-                Statistics: Num rows: 55 Data size: 584 Basic stats: COMPLETE 
Column stats: NONE
-                value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join21.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join21.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join21.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join21.q.out Sun Nov 23 
05:59:20 2014
@@ -14,6 +14,15 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
+            alias: src1
+            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+            Reduce Output Operator
+              key expressions: key (type: string)
+              sort order: +
+              Map-reduce partition columns: key (type: string)
+              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
+              value expressions: value (type: string)
+          TableScan
             alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
@@ -34,15 +43,6 @@ STAGE PLANS:
               Map-reduce partition columns: key (type: string)
               Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: value (type: string)
-          TableScan
-            alias: src1
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-            Reduce Output Operator
-              key expressions: key (type: string)
-              sort order: +
-              Map-reduce partition columns: key (type: string)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
-              value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join22.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join22.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join22.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join22.q.out Sun Nov 23 
05:59:20 2014
@@ -14,7 +14,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -24,8 +24,9 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
+                value expressions: value (type: string)
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
@@ -35,7 +36,6 @@ STAGE PLANS:
                 sort order: +
                 Map-reduce partition columns: key (type: string)
                 Statistics: Num rows: 250 Data size: 2656 Basic stats: 
COMPLETE Column stats: NONE
-                value expressions: value (type: string)
       Reduce Operator Tree:
         Join Operator
           condition map:

Modified: hive/trunk/ql/src/test/results/clientpositive/join23.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join23.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join23.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join23.q.out Sun Nov 23 
05:59:20 2014
@@ -15,7 +15,7 @@ STAGE PLANS:
     Map Reduce
       Map Operator Tree:
           TableScan
-            alias: src2
+            alias: src1
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 10) (type: boolean)
@@ -25,7 +25,7 @@ STAGE PLANS:
                 Statistics: Num rows: 166 Data size: 1763 Basic stats: 
COMPLETE Column stats: NONE
                 value expressions: key (type: string), value (type: string)
           TableScan
-            alias: src1
+            alias: src2
             Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 10) (type: boolean)

Modified: hive/trunk/ql/src/test/results/clientpositive/join25.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join25.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/join25.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/join25.q.out Sun Nov 23 
05:59:20 2014
@@ -23,13 +23,13 @@ POSTHOOK: type: QUERY
 STAGE DEPENDENCIES:
   Stage-9 is a root stage
   Stage-1 depends on stages: Stage-9
-  Stage-7 depends on stages: Stage-1 , consists of Stage-4, Stage-3, Stage-5
-  Stage-4
-  Stage-0 depends on stages: Stage-4, Stage-3, Stage-6
-  Stage-2 depends on stages: Stage-0
-  Stage-3
+  Stage-8 depends on stages: Stage-1 , consists of Stage-5, Stage-4, Stage-6
   Stage-5
-  Stage-6 depends on stages: Stage-5
+  Stage-0 depends on stages: Stage-5, Stage-4, Stage-7
+  Stage-3 depends on stages: Stage-0
+  Stage-4
+  Stage-6
+  Stage-7 depends on stages: Stage-6
 
 STAGE PLANS:
   Stage: Stage-9
@@ -89,10 +89,10 @@ STAGE PLANS:
       Local Work:
         Map Reduce Local Work
 
-  Stage: Stage-7
+  Stage: Stage-8
     Conditional Operator
 
-  Stage: Stage-4
+  Stage: Stage-5
     Move Operator
       files:
           hdfs directory: true
@@ -108,10 +108,10 @@ STAGE PLANS:
               serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
               name: default.dest_j1
 
-  Stage: Stage-2
+  Stage: Stage-3
     Stats-Aggr Operator
 
-  Stage: Stage-3
+  Stage: Stage-4
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -123,7 +123,7 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.dest_j1
 
-  Stage: Stage-5
+  Stage: Stage-6
     Map Reduce
       Map Operator Tree:
           TableScan
@@ -135,7 +135,7 @@ STAGE PLANS:
                   serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
                   name: default.dest_j1
 
-  Stage: Stage-6
+  Stage: Stage-7
     Move Operator
       files:
           hdfs directory: true

Modified: hive/trunk/ql/src/test/results/clientpositive/join26.q.out
URL: 
http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/join26.q.out?rev=1641162&r1=1641161&r2=1641162&view=diff
==============================================================================
Files hive/trunk/ql/src/test/results/clientpositive/join26.q.out (original) and 
hive/trunk/ql/src/test/results/clientpositive/join26.q.out Sun Nov 23 05:59:20 
2014 differ


Reply via email to