http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out 
b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
index 65aa3ef..bbfa756 100644
--- a/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
+++ b/ql/src/test/results/clientpositive/auto_sortmerge_join_9.q.out
@@ -1544,8 +1544,10 @@ STAGE PLANS:
         subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -1556,8 +1558,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1595,8 +1599,10 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -1607,8 +1613,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1730,8 +1738,10 @@ STAGE PLANS:
         subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -1742,8 +1752,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1786,8 +1798,10 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -1798,8 +1812,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1947,8 +1963,10 @@ STAGE PLANS:
         subq2:subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -1959,8 +1977,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2027,8 +2047,10 @@ STAGE PLANS:
         subq2:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -2039,8 +2061,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2226,8 +2250,10 @@ STAGE PLANS:
         src1:subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -2238,8 +2264,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2392,8 +2420,10 @@ STAGE PLANS:
         src1:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -2404,8 +2434,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2490,8 +2522,10 @@ STAGE PLANS:
         src2:subq2:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -2502,8 +2536,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2546,8 +2582,10 @@ STAGE PLANS:
         src2:subq2:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -2558,8 +2596,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -2722,11 +2762,14 @@ STAGE PLANS:
         subq2:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -2737,11 +2780,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -2779,11 +2825,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -2794,11 +2843,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -2940,8 +2992,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col0 (type: int)
@@ -2952,11 +3006,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -2994,11 +3051,14 @@ STAGE PLANS:
         subq2:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3009,8 +3069,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -3176,11 +3238,14 @@ STAGE PLANS:
         subq4:subq3:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3191,11 +3256,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3233,11 +3301,14 @@ STAGE PLANS:
         subq2:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3248,11 +3319,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3408,11 +3482,14 @@ STAGE PLANS:
         subq2:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3423,11 +3500,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3465,11 +3545,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3480,11 +3563,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 8) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3612,8 +3698,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col0 (type: int)
@@ -3624,11 +3712,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -3666,11 +3757,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -3681,8 +3775,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -3808,11 +3904,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 key (type: int)
@@ -3823,8 +3922,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -3862,8 +3963,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -3874,11 +3977,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4015,11 +4121,14 @@ STAGE PLANS:
         subq2:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4028,11 +4137,14 @@ STAGE PLANS:
         subq3:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4044,11 +4156,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4091,11 +4206,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4104,11 +4222,14 @@ STAGE PLANS:
         subq3:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4120,11 +4241,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4167,11 +4291,14 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4180,11 +4307,14 @@ STAGE PLANS:
         subq2:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4196,11 +4326,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key < 6) (type: boolean)
+              Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 3 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4354,8 +4487,10 @@ STAGE PLANS:
         a:b 
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 _col0 (type: int)
@@ -4366,11 +4501,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -4408,11 +4546,14 @@ STAGE PLANS:
         a:subq2:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (((key < 8) and (key < 6)) and key is not null) 
(type: boolean)
+              Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int)
                 outputColumnNames: _col0
+                Statistics: Num rows: 1 Data size: 7 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -4423,8 +4564,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/binarysortable_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/binarysortable_1.q.out 
b/ql/src/test/results/clientpositive/binarysortable_1.q.out
index c4ba7e0..421fd2e 100644
Binary files a/ql/src/test/results/clientpositive/binarysortable_1.q.out and 
b/ql/src/test/results/clientpositive/binarysortable_1.q.out differ

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
index d778203..42e6a3f 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_1.q.out
@@ -119,12 +119,12 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
-            Statistics: Num rows: 0 Data size: 21 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 21 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string), value (type: string)
@@ -136,12 +136,12 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
-            Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -149,7 +149,7 @@ STAGE PLANS:
                   0 key (type: string), value (type: string)
                   1 key (type: string), value (type: string)
                 Position of Big Table: 0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out 
b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
index aef77aa..af73309 100644
--- a/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
+++ b/ql/src/test/results/clientpositive/bucket_map_join_2.q.out
@@ -119,12 +119,12 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
-            Statistics: Num rows: 0 Data size: 21 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 21 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 21 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string), value (type: string)
@@ -136,12 +136,12 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
-            Statistics: Num rows: 0 Data size: 20 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and value is not null) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 20 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -149,7 +149,7 @@ STAGE PLANS:
                   0 key (type: string), value (type: string)
                   1 key (type: string), value (type: string)
                 Position of Big Table: 0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 22 Basic stats: COMPLETE 
Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out 
b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
index 72f2a07..471ff73 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
@@ -106,12 +106,12 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and (ds = '2008-04-08')) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -128,12 +128,12 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -142,18 +142,18 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col7
                 Position of Big Table: 0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: string), _col7 
(type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 0
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
@@ -274,12 +274,12 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -296,12 +296,12 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: (key is not null and (ds = '2008-04-08')) (type: 
boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL Column 
stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -310,18 +310,18 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col7
                 Position of Big Table: 1
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: _col0 (type: int), _col1 (type: string), _col7 
(type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 0
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 1 Data size: 0 Basic stats: PARTIAL 
Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
index eec099c..0e44631 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_2.q.out
@@ -246,8 +246,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -258,8 +260,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 20 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -314,8 +318,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 20 Data size: 140 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -326,8 +332,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -961,11 +969,14 @@ STAGE PLANS:
         b:test_table2 
           TableScan
             alias: test_table2
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -976,11 +987,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: test_table1
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -1035,11 +1049,14 @@ STAGE PLANS:
         a:test_table1 
           TableScan
             alias: test_table1
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -1050,11 +1067,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: test_table2
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
index 1a644a9..594dc55 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_4.q.out
@@ -94,8 +94,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -106,8 +108,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -162,8 +166,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -174,8 +180,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -364,8 +372,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -376,8 +386,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -429,8 +441,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -441,8 +455,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
index e4f90e4..5626efd 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_5.q.out
@@ -94,8 +94,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -106,8 +108,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -162,8 +166,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -174,8 +180,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -349,11 +357,14 @@ STAGE PLANS:
         b:test_table2 
           TableScan
             alias: test_table2
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -364,11 +375,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: test_table1
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1
@@ -423,11 +437,14 @@ STAGE PLANS:
         a:test_table1 
           TableScan
             alias: test_table1
+            Statistics: Num rows: 10 Data size: 70 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 5 Data size: 35 Basic stats: COMPLETE 
Column stats: NONE
                 HashTable Sink Operator
                   keys:
                     0 _col0 (type: int)
@@ -438,11 +455,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: test_table2
+            Statistics: Num rows: 84 Data size: 736 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
+              Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: int), value (type: string)
                 outputColumnNames: _col0, _col1
+                Statistics: Num rows: 42 Data size: 368 Basic stats: COMPLETE 
Column stats: NONE
                 Map Join Operator
                   condition map:
                        Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out 
b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
index 307c83b..a937fb4 100644
--- a/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketsortoptimize_insert_6.q.out
@@ -366,8 +366,10 @@ STAGE PLANS:
         b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -378,8 +380,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -434,8 +438,10 @@ STAGE PLANS:
         a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -446,8 +452,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -559,8 +567,10 @@ STAGE PLANS:
         subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -571,8 +581,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -627,8 +639,10 @@ STAGE PLANS:
         subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -639,8 +653,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1074,8 +1090,10 @@ STAGE PLANS:
         subq2:subq1:b 
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -1086,8 +1104,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -1142,8 +1162,10 @@ STAGE PLANS:
         subq2:subq1:a 
           TableScan
             alias: a
+            Statistics: Num rows: 10 Data size: 91 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 3 Data size: 27 Basic stats: COMPLETE 
Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int), key2 (type: int)
@@ -1154,8 +1176,10 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: b
+            Statistics: Num rows: 84 Data size: 979 Basic stats: COMPLETE 
Column stats: NONE
             Filter Operator
               predicate: (key is not null and key2 is not null) (type: boolean)
+              Statistics: Num rows: 21 Data size: 244 Basic stats: COMPLETE 
Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/column_access_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/column_access_stats.q.out 
b/ql/src/test/results/clientpositive/column_access_stats.q.out
index a779564..e904347 100644
--- a/ql/src/test/results/clientpositive/column_access_stats.q.out
+++ b/ql/src/test/results/clientpositive/column_access_stats.q.out
@@ -92,11 +92,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: t1
-          Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: key (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             ListSink
 
 PREHOOK: query: SELECT key FROM (SELECT key, val FROM T1) subq1
@@ -124,11 +124,11 @@ STAGE PLANS:
       Processor Tree:
         TableScan
           alias: t1
-          Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: key (type: string)
             outputColumnNames: _col0
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             ListSink
 
 PREHOOK: query: SELECT k FROM (SELECT key as k, val as v FROM T1) subq1
@@ -188,32 +188,32 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Union
-                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: val (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Union
-                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -265,32 +265,32 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Union
-                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
                       serde: org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Select Operator
               expressions: key (type: string)
               outputColumnNames: _col0
-              Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Union
-                Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 0 Data size: 60 Basic stats: PARTIAL 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 60 Basic stats: COMPLETE 
Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -371,15 +371,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 30 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: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: t2
             Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE
@@ -482,15 +482,15 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: ((val = 3) and key is not null) (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 30 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: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: t2
             Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE
@@ -510,14 +510,14 @@ STAGE PLANS:
             0 key (type: string)
             1 key (type: string)
           outputColumnNames: _col0, _col5
-          Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col0 (type: string), '3' (type: string), _col5 
(type: string), '3' (type: string)
             outputColumnNames: _col0, _col1, _col2, _col3
-            Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE 
Column stats: NONE
+              Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -564,19 +564,19 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: ((key = 5) and val is not null) (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: val (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 30 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: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: t2
             Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE
@@ -600,10 +600,10 @@ STAGE PLANS:
             0 _col0 (type: string)
             1 _col0 (type: string)
           outputColumnNames: _col0
-          Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
+          Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 3 Basic stats: COMPLETE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 33 Basic stats: COMPLETE Column 
stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -665,19 +665,19 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: t1
-            Statistics: Num rows: 0 Data size: 30 Basic stats: PARTIAL Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: key (type: string)
                 outputColumnNames: _col0
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 30 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: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 1 Data size: 30 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             alias: t2
             Statistics: Num rows: 5 Data size: 15 Basic stats: COMPLETE Column 
stats: NONE

http://git-wip-us.apache.org/repos/asf/hive/blob/d823fc80/ql/src/test/results/clientpositive/complex_alias.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/complex_alias.q.out 
b/ql/src/test/results/clientpositive/complex_alias.q.out
index 133ce91..ce4b28c 100644
--- a/ql/src/test/results/clientpositive/complex_alias.q.out
+++ b/ql/src/test/results/clientpositive/complex_alias.q.out
@@ -97,9 +97,9 @@ STAGE PLANS:
           keys: KEY._col0 (type: int)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: 
NONE
+          Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:
@@ -113,11 +113,11 @@ STAGE PLANS:
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
           TableScan
             Reduce Output Operator
               sort order: 
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
               value expressions: _col1 (type: string), _col2 (type: string)
       Reduce Operator Tree:
         Join Operator
@@ -127,14 +127,14 @@ STAGE PLANS:
             0 
             1 
           outputColumnNames: _col2, _col3
-          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: 
NONE
+          Statistics: Num rows: 1 Data size: 18 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col2 (type: string), _col3 (type: string)
             outputColumnNames: _col0, _col1
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 18 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 18 Basic stats: COMPLETE 
Column stats: NONE
               table:
                   input format: org.apache.hadoop.mapred.TextInputFormat
                   output format: 
org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat
@@ -148,63 +148,63 @@ STAGE PLANS:
             Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (col0 = col0) (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: '42' (type: string), col0 (type: int)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
                 Union
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 34 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col2 (type: int), _col1 (type: string)
                     outputColumnNames: _col2, _col1
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col2 (type: int), _col1 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int), _col1 (type: 
string)
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: string)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
           TableScan
             alias: agg1
             Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
             Filter Operator
               predicate: (col0 = col0) (type: boolean)
-              Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+              Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
               Select Operator
                 expressions: '41' (type: string), col0 (type: int)
                 outputColumnNames: _col1, _col2
-                Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+                Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE 
Column stats: NONE
                 Union
-                  Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                  Statistics: Num rows: 2 Data size: 34 Basic stats: COMPLETE 
Column stats: NONE
                   Select Operator
                     expressions: _col2 (type: int), _col1 (type: string)
                     outputColumnNames: _col2, _col1
-                    Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                    Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
                     Group By Operator
                       keys: _col2 (type: int), _col1 (type: string)
                       mode: hash
                       outputColumnNames: _col0, _col1
-                      Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                      Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
                       Reduce Output Operator
                         key expressions: _col0 (type: int), _col1 (type: 
string)
                         sort order: ++
                         Map-reduce partition columns: _col0 (type: int), _col1 
(type: string)
-                        Statistics: Num rows: 0 Data size: 0 Basic stats: NONE 
Column stats: NONE
+                        Statistics: Num rows: 2 Data size: 34 Basic stats: 
COMPLETE Column stats: NONE
       Reduce Operator Tree:
         Group By Operator
           keys: KEY._col0 (type: int), KEY._col1 (type: string)
           mode: mergepartial
           outputColumnNames: _col0, _col1
-          Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column stats: 
NONE
+          Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
           Select Operator
             expressions: _col1 (type: string), _col1 (type: string)
             outputColumnNames: _col1, _col2
-            Statistics: Num rows: 0 Data size: 0 Basic stats: NONE Column 
stats: NONE
+            Statistics: Num rows: 1 Data size: 17 Basic stats: COMPLETE Column 
stats: NONE
             File Output Operator
               compressed: false
               table:

Reply via email to