You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by kg...@apache.org on 2019/01/23 16:39:13 UTC

[41/51] [partial] hive git commit: HIVE-17084: Turn on hive.stats.fetch.column.stats configuration flag (Zoltan Haindrich reviewed by Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_1.q.out b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
index 663e392..f0f626b 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_1.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_1.q.out
@@ -179,12 +179,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -204,12 +204,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -217,7 +217,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 264 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -420,12 +420,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_2.q.out b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
index 486ef56..d985a8f 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_2.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_2.q.out
@@ -163,12 +163,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -188,12 +188,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -201,7 +201,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 132 Data size: 63932 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 125 Data size: 82847 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -404,12 +404,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_3.q.out b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
index 8d6eb27..e3eed76 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_3.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_3.q.out
@@ -211,12 +211,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -236,12 +236,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -249,7 +249,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 132 Data size: 63932 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 125 Data size: 82847 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -401,12 +401,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 120 Data size: 79280 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 120 Data size: 58120 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 114 Data size: 75316 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_4.q.out b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
index 674b98d..e58f630 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_4.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_4.q.out
@@ -227,12 +227,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -252,12 +252,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -265,7 +265,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 264 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -417,12 +417,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 56 Data size: 37620 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 56 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 54 Data size: 36276 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_5.q.out b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
index f859c5f..1a1db08 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_5.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_5.q.out
@@ -89,12 +89,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -114,12 +114,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -127,7 +127,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 1 Data size: 63932 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 1 Data size: 202 Basic stats: COMPLETE Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -267,12 +267,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_6.q.out b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
index 4acf220..6e9daeb 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_6.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_6.q.out
@@ -111,12 +111,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 58120 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 184 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -136,12 +136,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -149,7 +149,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 123 Data size: 60500 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 117 Data size: 78681 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -348,12 +348,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_7.q.out b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
index 7317bb4..7d7a7e9 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_7.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_7.q.out
@@ -246,12 +246,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -271,12 +271,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -284,7 +284,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 264 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -491,12 +491,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketcontext_8.q.out b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
index 9c5d352..eb5aa9d 100644
--- a/ql/src/test/results/clientpositive/bucketcontext_8.q.out
+++ b/ql/src/test/results/clientpositive/bucketcontext_8.q.out
@@ -246,12 +246,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 112 Data size: 74872 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 112 Data size: 55000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 107 Data size: 71529 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: string)
@@ -271,12 +271,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -284,7 +284,7 @@ STAGE PLANS:
                   0 key (type: string)
                   1 key (type: string)
                 Position of Big Table: 1
-                Statistics: Num rows: 264 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 250 Data size: 165502 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -491,12 +491,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 240 Data size: 158376 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 240 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 228 Data size: 150457 Basic stats: PARTIAL Column stats: NONE
               Sorted Merge Bucket Map Join Operator
                 condition map:
                      Inner Join 0 to 1

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
index 40248eb..c1cf04c 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin10.q.out
@@ -262,12 +262,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 178 Data size: 69500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 178 Data size: 70184 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 178 Data size: 69500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 170 Data size: 67029 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -280,12 +280,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 178 Data size: 69500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 178 Data size: 70184 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 178 Data size: 69500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 170 Data size: 67029 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -293,7 +293,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 195 Data size: 76450 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 187 Data size: 73731 Basic stats: PARTIAL Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
index 1a0fccd..3635425 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin11.q.out
@@ -270,12 +270,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 219 Data size: 86460 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 209 Data size: 82512 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -295,12 +295,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 219 Data size: 86460 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 209 Data size: 82512 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -308,7 +308,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 240 Data size: 94182 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 229 Data size: 90763 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -623,12 +623,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 219 Data size: 126756 Basic stats: PARTIAL Column stats: PARTIAL
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 209 Data size: 120968 Basic stats: PARTIAL Column stats: PARTIAL
               HashTable Sink Operator
                 keys:
                   0 key (type: int), part (type: string)
@@ -648,12 +648,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: (part is not null and key is not null) (type: boolean)
-            Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 219 Data size: 126756 Basic stats: PARTIAL Column stats: PARTIAL
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 219 Data size: 85620 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 209 Data size: 120968 Basic stats: PARTIAL Column stats: PARTIAL
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -661,7 +661,7 @@ STAGE PLANS:
                   0 key (type: int), part (type: string)
                   1 key (type: int), part (type: string)
                 Position of Big Table: 0
-                Statistics: Num rows: 240 Data size: 94182 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 229 Data size: 133064 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
index 927600e..fac239c 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin12.q.out
@@ -179,12 +179,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -204,12 +204,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -217,7 +217,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 104 Data size: 30250 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 100 Data size: 29363 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -426,12 +426,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -444,12 +444,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -457,7 +457,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 104 Data size: 30250 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 100 Data size: 29363 Basic stats: PARTIAL Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
index 137a356..19d3a84 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin13.q.out
@@ -150,12 +150,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -168,12 +168,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1000 Data size: 4000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1000 Data size: 10624 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1000 Data size: 4000 Basic stats: COMPLETE Column stats: COMPLETE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -181,7 +181,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 1100 Data size: 11686 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 1100 Data size: 4400 Basic stats: COMPLETE Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash
@@ -445,12 +445,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -470,12 +470,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '2') and key is not null) (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -483,7 +483,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 550 Data size: 2200 Basic stats: COMPLETE Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -703,12 +703,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -728,12 +728,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -741,7 +741,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 550 Data size: 2200 Basic stats: COMPLETE Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -961,12 +961,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -986,12 +986,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 500 Data size: 5312 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 500 Data size: 2000 Basic stats: COMPLETE Column stats: COMPLETE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -999,7 +999,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 550 Data size: 5843 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 550 Data size: 2200 Basic stats: COMPLETE Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
index 72bbf80..ac6bad2 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin5.q.out
@@ -207,12 +207,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -232,12 +232,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 298 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 298 Data size: 169820 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 298 Data size: 116240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 284 Data size: 161841 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -246,18 +246,18 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col6
                 Position of Big Table: 1
-                Statistics: Num rows: 327 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 312 Data size: 178025 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 327 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                  Statistics: Num rows: 312 Data size: 178025 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 1
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 327 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 312 Data size: 178025 Basic stats: PARTIAL Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
@@ -288,7 +288,7 @@ STAGE PLANS:
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
                     outputColumnNames: key, value1, value2
-                    Statistics: Num rows: 327 Data size: 127864 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 312 Data size: 178025 Basic stats: PARTIAL Column stats: NONE
                     Group By Operator
                       aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll')
                       mode: hash
@@ -821,12 +821,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -846,12 +846,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 156 Data size: 61240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 156 Data size: 89440 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 156 Data size: 61240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 149 Data size: 85426 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -860,18 +860,18 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col6
                 Position of Big Table: 1
-                Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                  Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 1
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
@@ -902,7 +902,7 @@ STAGE PLANS:
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
                     outputColumnNames: key, value1, value2
-                    Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                     Group By Operator
                       aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll')
                       mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
index 6170c31..328663c 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin8.q.out
@@ -145,12 +145,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -170,12 +170,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -183,7 +183,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 104 Data size: 30250 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 100 Data size: 29363 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()
@@ -401,12 +401,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -426,12 +426,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -439,7 +439,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 104 Data size: 30250 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 100 Data size: 29363 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Group By Operator
                   aggregations: count()

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
index 753761a..cf4b9f9 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin9.q.out
@@ -153,12 +153,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 145 Data size: 42000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 145 Data size: 42556 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 145 Data size: 42000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 138 Data size: 40501 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -171,12 +171,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -184,7 +184,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 159 Data size: 46200 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 151 Data size: 44551 Basic stats: PARTIAL Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash
@@ -434,12 +434,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -452,12 +452,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: ((part = '1') and key is not null) (type: boolean)
-            Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 95 Data size: 27868 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 95 Data size: 27500 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 91 Data size: 26694 Basic stats: PARTIAL Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -465,7 +465,7 @@ STAGE PLANS:
                   0 key (type: int)
                   1 key (type: int)
                 Position of Big Table: 0
-                Statistics: Num rows: 104 Data size: 30250 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 100 Data size: 29363 Basic stats: PARTIAL Column stats: NONE
                 Group By Operator
                   aggregations: count()
                   mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
index 6854a90..a842b28 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
@@ -154,12 +154,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: (key is not null and (ds = '2008-04-08')) (type: boolean)
-            Statistics: Num rows: 140 Data size: 42000 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 140 Data size: 67192 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 140 Data size: 42000 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 133 Data size: 63832 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -172,12 +172,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -186,17 +186,17 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col6
                 Position of Big Table: 0
-                Statistics: Num rows: 154 Data size: 46200 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 146 Data size: 70215 Basic stats: PARTIAL Column stats: NONE
                 Select Operator
                   expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 154 Data size: 46200 Basic stats: PARTIAL Column stats: NONE
+                  Statistics: Num rows: 146 Data size: 70215 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 1
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 154 Data size: 46200 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 146 Data size: 70215 Basic stats: PARTIAL Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
@@ -227,7 +227,7 @@ STAGE PLANS:
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
                     outputColumnNames: key, value1, value2
-                    Statistics: Num rows: 154 Data size: 46200 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 146 Data size: 70215 Basic stats: PARTIAL Column stats: NONE
                     Group By Operator
                       aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll')
                       mode: hash

http://git-wip-us.apache.org/repos/asf/hive/blob/268a6e5a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
index c436065..764b2ba 100644
--- a/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
+++ b/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
@@ -212,12 +212,12 @@ STAGE PLANS:
           TableScan
             alias: b
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 156 Data size: 61240 Basic stats: PARTIAL Column stats: NONE
+            Statistics: Num rows: 156 Data size: 89440 Basic stats: PARTIAL Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 156 Data size: 61240 Basic stats: PARTIAL Column stats: NONE
+              Statistics: Num rows: 149 Data size: 85426 Basic stats: PARTIAL Column stats: NONE
               HashTable Sink Operator
                 keys:
                   0 key (type: int)
@@ -237,12 +237,12 @@ STAGE PLANS:
           TableScan
             alias: a
             filterExpr: key is not null (type: boolean)
-            Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
             GatherStats: false
             Filter Operator
               isSamplingPred: false
               predicate: key is not null (type: boolean)
-              Statistics: Num rows: 1 Data size: 27500 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 1 Data size: 188 Basic stats: COMPLETE Column stats: NONE
               Map Join Operator
                 condition map:
                      Inner Join 0 to 1
@@ -251,18 +251,18 @@ STAGE PLANS:
                   1 key (type: int)
                 outputColumnNames: _col0, _col1, _col6
                 Position of Big Table: 0
-                Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                 BucketMapJoin: true
                 Select Operator
                   expressions: CAST( _col0 AS STRING) (type: string), _col1 (type: string), _col6 (type: string)
                   outputColumnNames: _col0, _col1, _col2
-                  Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                  Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                   File Output Operator
                     compressed: false
                     GlobalTableId: 1
 #### A masked pattern was here ####
                     NumFilesPerFileSink: 1
-                    Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
 #### A masked pattern was here ####
                     table:
                         input format: org.apache.hadoop.mapred.TextInputFormat
@@ -293,7 +293,7 @@ STAGE PLANS:
                   Select Operator
                     expressions: _col0 (type: string), _col1 (type: string), _col2 (type: string)
                     outputColumnNames: key, value1, value2
-                    Statistics: Num rows: 171 Data size: 67364 Basic stats: PARTIAL Column stats: NONE
+                    Statistics: Num rows: 163 Data size: 93968 Basic stats: PARTIAL Column stats: NONE
                     Group By Operator
                       aggregations: compute_stats(key, 'hll'), compute_stats(value1, 'hll'), compute_stats(value2, 'hll')
                       mode: hash