http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby4_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby4_noskew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby4_noskew.q.out
index 04f58fa..4af92e8 100644
--- a/ql/src/test/results/clientpositive/spark/groupby4_noskew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby4_noskew.q.out
@@ -67,7 +67,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT substr(src.key,1,1) GROUP BY 
substr(src.key,1,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby5.q.out 
b/ql/src/test/results/clientpositive/spark/groupby5.q.out
index d292f74..8dfed8b 100644
--- a/ql/src/test/results/clientpositive/spark/groupby5.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby5.q.out
@@ -92,7 +92,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest1 
 SELECT src.key, sum(substr(src.value,5)) 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby5_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby5_map.q.out 
b/ql/src/test/results/clientpositive/spark/groupby5_map.q.out
index add3094..96cf6b7 100644
--- a/ql/src/test/results/clientpositive/spark/groupby5_map.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby5_map.q.out
@@ -73,7 +73,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby5_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby5_map_skew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby5_map_skew.q.out
index 924ef5d..11a6558 100644
--- a/ql/src/test/results/clientpositive/spark/groupby5_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby5_map_skew.q.out
@@ -73,7 +73,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src INSERT OVERWRITE TABLE dest1 SELECT sum(src.key)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby5_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby5_noskew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby5_noskew.q.out
index 300ccb6..16ac57b 100644
--- a/ql/src/test/results/clientpositive/spark/groupby5_noskew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby5_noskew.q.out
@@ -77,7 +77,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest1 
 SELECT src.key, sum(substr(src.value,5)) 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby6.q.out 
b/ql/src/test/results/clientpositive/spark/groupby6.q.out
index 4f406d7..04e6127 100644
--- a/ql/src/test/results/clientpositive/spark/groupby6.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby6.q.out
@@ -80,7 +80,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby6_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby6_map.q.out 
b/ql/src/test/results/clientpositive/spark/groupby6_map.q.out
index 03f68c6..509014a 100644
--- a/ql/src/test/results/clientpositive/spark/groupby6_map.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby6_map.q.out
@@ -72,7 +72,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby6_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby6_map_skew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby6_map_skew.q.out
index 606b5d5..e2260ed 100644
--- a/ql/src/test/results/clientpositive/spark/groupby6_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby6_map_skew.q.out
@@ -85,7 +85,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby6_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby6_noskew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby6_noskew.q.out
index eb72f01..f955519 100644
--- a/ql/src/test/results/clientpositive/spark/groupby6_noskew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby6_noskew.q.out
@@ -67,7 +67,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT DISTINCT substr(src.value,5,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby7_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby7_map.q.out 
b/ql/src/test/results/clientpositive/spark/groupby7_map.q.out
index 31daab8..9260e7d 100644
--- a/ql/src/test/results/clientpositive/spark/groupby7_map.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby7_map.q.out
@@ -112,7 +112,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -125,7 +126,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY 
SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby7_map_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby7_map_multi_single_reducer.q.out
 
b/ql/src/test/results/clientpositive/spark/groupby7_map_multi_single_reducer.q.out
index 625a737..c628b39 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby7_map_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby7_map_multi_single_reducer.q.out
@@ -105,7 +105,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -118,7 +119,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY 
SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby7_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby7_map_skew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby7_map_skew.q.out
index 4fbfd30..e55a79d 100644
--- a/ql/src/test/results/clientpositive/spark/groupby7_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby7_map_skew.q.out
@@ -127,7 +127,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -140,7 +141,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY 
SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby7_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby7_noskew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby7_noskew.q.out
index a26247a..9e05b99 100644
--- a/ql/src/test/results/clientpositive/spark/groupby7_noskew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby7_noskew.q.out
@@ -106,7 +106,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -119,7 +120,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY 
SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby7_noskew_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby7_noskew_multi_single_reducer.q.out
 
b/ql/src/test/results/clientpositive/spark/groupby7_noskew_multi_single_reducer.q.out
index 2dce301..9a9f7b2 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby7_noskew_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby7_noskew_multi_single_reducer.q.out
@@ -125,7 +125,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -138,7 +139,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, sum(SUBSTR(SRC.value,5)) GROUP BY 
SRC.key ORDER BY SRC.key limit 10

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby8.q.out 
b/ql/src/test/results/clientpositive/spark/groupby8.q.out
index f7f3279..c66a53d 100644
--- a/ql/src/test/results/clientpositive/spark/groupby8.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby8.q.out
@@ -120,7 +120,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -133,7 +134,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
@@ -893,7 +895,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -906,7 +909,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby8_map.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby8_map.q.out 
b/ql/src/test/results/clientpositive/spark/groupby8_map.q.out
index 288ca3f..25c07d0 100644
--- a/ql/src/test/results/clientpositive/spark/groupby8_map.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby8_map.q.out
@@ -104,7 +104,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -117,7 +118,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out
index 9e76fd5..1da8890 100644
--- a/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby8_map_skew.q.out
@@ -126,7 +126,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -139,7 +140,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out 
b/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out
index 288ca3f..25c07d0 100644
--- a/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby8_noskew.q.out
@@ -104,7 +104,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -117,7 +118,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby9.q.out 
b/ql/src/test/results/clientpositive/spark/groupby9.q.out
index d59d8cf..c016e4b 100644
--- a/ql/src/test/results/clientpositive/spark/groupby9.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby9.q.out
@@ -131,7 +131,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -144,7 +145,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
@@ -916,7 +918,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -929,7 +932,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
@@ -1701,7 +1705,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -1714,7 +1719,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key
@@ -2488,7 +2494,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -2501,7 +2508,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(SUBSTR(SRC.value,5)) GROUP 
BY SRC.key
@@ -3273,7 +3281,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -3286,7 +3295,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) GROUP BY SRC.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
index 169ee04..3b5ec42 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_complex_types.q.out
@@ -175,7 +175,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -188,7 +189,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-5
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-2
     Move Operator
@@ -201,7 +203,8 @@ STAGE PLANS:
               name: default.dest3
 
   Stage: Stage-6
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT ARRAY(SRC.key), COUNT(1) GROUP BY 
ARRAY(SRC.key)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
 
b/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
index 7a730d2..71e74a9 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_complex_types_multi_single_reducer.q.out
@@ -159,7 +159,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -172,7 +173,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE DEST1 SELECT ARRAY(SRC.key) as keyarray, COUNT(1) GROUP 
BY ARRAY(SRC.key) ORDER BY keyarray limit 10

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
index 52c87ef..7629fe6 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_cube1.q.out
@@ -704,7 +704,8 @@ STAGE PLANS:
               name: default.t2
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -717,7 +718,8 @@ STAGE PLANS:
               name: default.t3
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM T1
 INSERT OVERWRITE TABLE T2 SELECT key, val, count(1) group by key, val with cube

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
index f3a95bd..d1fcd48 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_map_ppr.q.out
@@ -234,7 +234,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
index 666f355..30e5daa 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_map_ppr_multi_distinct.q.out
@@ -234,7 +234,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
 
b/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
index bf4132a..f88ff7a 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_multi_insert_common_distinct.q.out
@@ -131,7 +131,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -144,7 +145,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from src
 insert overwrite table dest1 select key, count(distinct value) group by key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
index c16df1b..89db8ce 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer.q.out
@@ -157,7 +157,8 @@ STAGE PLANS:
               name: default.dest_g4
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-0
     Move Operator
@@ -170,7 +171,8 @@ STAGE PLANS:
               name: default.dest_g2
 
   Stage: Stage-5
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -183,7 +185,8 @@ STAGE PLANS:
               name: default.dest_g3
 
   Stage: Stage-6
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) WHERE substr(src.key,1,1) 
>= 5 GROUP BY substr(src.key,1,1)
@@ -468,7 +471,8 @@ STAGE PLANS:
               name: default.dest_g4
 
   Stage: Stage-6
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-0
     Move Operator
@@ -481,7 +485,8 @@ STAGE PLANS:
               name: default.dest_g2
 
   Stage: Stage-7
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -494,7 +499,8 @@ STAGE PLANS:
               name: default.dest_g3
 
   Stage: Stage-8
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-3
     Move Operator
@@ -507,7 +513,8 @@ STAGE PLANS:
               name: default.dest_h2
 
   Stage: Stage-9
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-4
     Move Operator
@@ -520,7 +527,8 @@ STAGE PLANS:
               name: default.dest_h3
 
   Stage: Stage-10
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT 
substr(src.value,5)), concat(substr(src.key,1,1),sum(substr(src.value,5))), 
sum(DISTINCT substr(src.value, 5)), count(src.value) WHERE substr(src.key,1,1) 
>= 5 GROUP BY substr(src.key,1,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
index 37deb93..a90082f 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer2.q.out
@@ -110,7 +110,8 @@ STAGE PLANS:
               name: default.dest_g2
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -123,7 +124,8 @@ STAGE PLANS:
               name: default.dest_g3
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest_g2 SELECT substr(src.key,1,1), count(DISTINCT 
src.key) WHERE substr(src.key,1,1) >= 5 GROUP BY substr(src.key,1,1)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
index f9eaa3c..50ae717 100644
--- 
a/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/groupby_multi_single_reducer3.q.out
@@ -122,7 +122,8 @@ STAGE PLANS:
               name: default.e1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -135,7 +136,8 @@ STAGE PLANS:
               name: default.e2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from src
 insert overwrite table e1
@@ -294,7 +296,8 @@ STAGE PLANS:
               name: default.e1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -307,7 +310,8 @@ STAGE PLANS:
               name: default.e2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from src
 insert overwrite table e1
@@ -466,7 +470,8 @@ STAGE PLANS:
               name: default.e1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -479,7 +484,8 @@ STAGE PLANS:
               name: default.e2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from src
 insert overwrite table e1
@@ -638,7 +644,8 @@ STAGE PLANS:
               name: default.e1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -651,7 +658,8 @@ STAGE PLANS:
               name: default.e2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from src
 insert overwrite table e1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_position.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_position.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
index 91c2581..a88176f 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_position.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_position.q.out
@@ -129,7 +129,8 @@ STAGE PLANS:
               name: default.testtable1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -142,7 +143,8 @@ STAGE PLANS:
               name: default.testtable2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE testTable1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) WHERE SRC.key < 20 GROUP BY 1
@@ -320,7 +322,8 @@ STAGE PLANS:
               name: default.testtable1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -333,7 +336,8 @@ STAGE PLANS:
               name: default.testtable2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM SRC
 INSERT OVERWRITE TABLE testTable1 SELECT SRC.key, COUNT(DISTINCT 
SUBSTR(SRC.value,5)) WHERE SRC.key < 20 GROUP BY 1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
index e45b5c2..2bbffaf 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_ppr.q.out
@@ -227,7 +227,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
index c3c97f5..14c287f 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_ppr_multi_distinct.q.out
@@ -227,7 +227,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src
@@ -494,7 +495,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
index 68670ab..29b111f 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_rollup1.q.out
@@ -537,7 +537,8 @@ STAGE PLANS:
               name: default.t2
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -550,7 +551,8 @@ STAGE PLANS:
               name: default.t3
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM T1
 INSERT OVERWRITE TABLE T2 SELECT key, val, count(1) group by key, val with 
rollup

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
index 8292e3a..5ceb9e9 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_1_23.q.out
@@ -189,7 +189,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -400,7 +401,8 @@ STAGE PLANS:
               name: default.outputtbl2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl2
@@ -585,7 +587,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -768,7 +771,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -959,7 +963,8 @@ STAGE PLANS:
               name: default.outputtbl3
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl3
@@ -1171,7 +1176,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -1377,7 +1383,8 @@ STAGE PLANS:
               name: default.outputtbl3
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl3
@@ -1595,7 +1602,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -1897,7 +1905,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -2232,7 +2241,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -2538,7 +2548,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -3014,7 +3025,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -3197,7 +3209,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -3391,7 +3404,8 @@ STAGE PLANS:
               name: default.outputtbl5
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl5
@@ -3584,7 +3598,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -3784,7 +3799,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -3941,7 +3957,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -3954,7 +3971,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM T2
 INSERT OVERWRITE TABLE DEST1 SELECT key, count(1) GROUP BY key
@@ -4105,7 +4123,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -4118,7 +4137,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (select key, val from T2 where key = 8) x
 INSERT OVERWRITE TABLE DEST1 SELECT key, count(1) GROUP BY key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out 
b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
index 4284726..4b11eb4 100644
--- a/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
+++ b/ql/src/test/results/clientpositive/spark/groupby_sort_skew_1_23.q.out
@@ -189,7 +189,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -419,7 +420,8 @@ STAGE PLANS:
               name: default.outputtbl2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl2
@@ -604,7 +606,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -787,7 +790,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -978,7 +982,8 @@ STAGE PLANS:
               name: default.outputtbl3
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl3
@@ -1209,7 +1214,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -1434,7 +1440,8 @@ STAGE PLANS:
               name: default.outputtbl3
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl3
@@ -1671,7 +1678,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -1973,7 +1981,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -2327,7 +2336,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -2633,7 +2643,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -3147,7 +3158,8 @@ STAGE PLANS:
               name: default.outputtbl1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl1
@@ -3330,7 +3342,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -3524,7 +3537,8 @@ STAGE PLANS:
               name: default.outputtbl5
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl5
@@ -3717,7 +3731,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -3917,7 +3932,8 @@ STAGE PLANS:
               name: default.outputtbl4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE outputTbl4
@@ -4089,7 +4105,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -4102,7 +4119,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM T2
 INSERT OVERWRITE TABLE DEST1 SELECT key, count(1) GROUP BY key
@@ -4268,7 +4286,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -4281,7 +4300,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (select key, val from T2 where key = 8) x
 INSERT OVERWRITE TABLE DEST1 SELECT key, count(1) GROUP BY key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
 
b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
index 49eafbe..e0d5e58 100644
--- 
a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_map_operators.q.out
@@ -103,7 +103,8 @@ STAGE PLANS:
               name: default.test_table_out
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1') 
 SELECT key, count(*) FROM test_table1 GROUP BY key
@@ -260,7 +261,8 @@ STAGE PLANS:
               name: default.test_table_out
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1') 
 SELECT a.key, a.value FROM (
@@ -381,7 +383,8 @@ STAGE PLANS:
               name: default.test_table_out
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1')
 SELECT /*+ MAPJOIN(a) */ a.key, b.value FROM test_table1 a JOIN test_table2 b 
ON a.key = b.key
@@ -516,7 +519,8 @@ STAGE PLANS:
               name: default.test_table_out
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table_out PARTITION (part = '1')
 SELECT /*+ MAPJOIN(a) */ b.value, count(*) FROM test_table1 a JOIN test_table2 
b ON a.key = b.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
----------------------------------------------------------------------
diff --git 
a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out 
b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
index 8da2705..1bdf641 100644
--- 
a/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
+++ 
b/ql/src/test/results/clientpositive/spark/infer_bucket_sort_num_buckets.q.out
@@ -77,7 +77,8 @@ STAGE PLANS:
               name: default.test_table
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE test_table PARTITION (ds = 
'2008-04-08', hr)
 SELECT key2, value, cast(hr as int) FROM

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/innerjoin.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/innerjoin.q.out 
b/ql/src/test/results/clientpositive/spark/innerjoin.q.out
index 9328b99..c02aa2a 100644
--- a/ql/src/test/results/clientpositive/spark/innerjoin.q.out
+++ b/ql/src/test/results/clientpositive/spark/innerjoin.q.out
@@ -95,7 +95,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src src1 INNER JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input12.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input12.q.out 
b/ql/src/test/results/clientpositive/spark/input12.q.out
index efbaaf9..2fba863 100644
--- a/ql/src/test/results/clientpositive/spark/input12.q.out
+++ b/ql/src/test/results/clientpositive/spark/input12.q.out
@@ -110,7 +110,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -123,7 +124,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-5
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-2
     Move Operator
@@ -139,7 +141,8 @@ STAGE PLANS:
               name: default.dest3
 
   Stage: Stage-6
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src 
 INSERT OVERWRITE TABLE dest1 SELECT src.* WHERE src.key < 100

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input13.q.out 
b/ql/src/test/results/clientpositive/spark/input13.q.out
index a72898f..dc5eec3 100644
--- a/ql/src/test/results/clientpositive/spark/input13.q.out
+++ b/ql/src/test/results/clientpositive/spark/input13.q.out
@@ -127,7 +127,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-5
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -140,7 +141,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-6
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-2
     Move Operator
@@ -156,7 +158,8 @@ STAGE PLANS:
               name: default.dest3
 
   Stage: Stage-7
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-3
     Move Operator

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input14.q.out 
b/ql/src/test/results/clientpositive/spark/input14.q.out
index 36f162e..ef2f37c 100644
--- a/ql/src/test/results/clientpositive/spark/input14.q.out
+++ b/ql/src/test/results/clientpositive/spark/input14.q.out
@@ -87,7 +87,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
   FROM src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input17.q.out 
b/ql/src/test/results/clientpositive/spark/input17.q.out
index d95dbcb..5f207aa 100644
--- a/ql/src/test/results/clientpositive/spark/input17.q.out
+++ b/ql/src/test/results/clientpositive/spark/input17.q.out
@@ -84,7 +84,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
   FROM src_thrift

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input18.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input18.q.out 
b/ql/src/test/results/clientpositive/spark/input18.q.out
index 65850b2..ba77d15 100644
--- a/ql/src/test/results/clientpositive/spark/input18.q.out
+++ b/ql/src/test/results/clientpositive/spark/input18.q.out
@@ -87,7 +87,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
   FROM src

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input1_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input1_limit.q.out 
b/ql/src/test/results/clientpositive/spark/input1_limit.q.out
index dd49287..cfc96cd 100644
--- a/ql/src/test/results/clientpositive/spark/input1_limit.q.out
+++ b/ql/src/test/results/clientpositive/spark/input1_limit.q.out
@@ -133,7 +133,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -146,7 +147,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src
 INSERT OVERWRITE TABLE dest1 SELECT src.key, src.value WHERE src.key < 100 
LIMIT 10

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/input_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/input_part2.q.out 
b/ql/src/test/results/clientpositive/spark/input_part2.q.out
index a728e97..12a0afb 100644
--- a/ql/src/test/results/clientpositive/spark/input_part2.q.out
+++ b/ql/src/test/results/clientpositive/spark/input_part2.q.out
@@ -254,7 +254,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
   Stage: Stage-1
@@ -286,7 +287,8 @@ STAGE PLANS:
               name: default.dest2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/insert1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/insert1.q.out 
b/ql/src/test/results/clientpositive/spark/insert1.q.out
index fa8757f..25f7289 100644
--- a/ql/src/test/results/clientpositive/spark/insert1.q.out
+++ b/ql/src/test/results/clientpositive/spark/insert1.q.out
@@ -70,7 +70,8 @@ STAGE PLANS:
               name: default.insert1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: explain insert into table INSERT1 select a.key, a.value from 
insert2 a WHERE (a.key=-1)
 PREHOOK: type: QUERY
@@ -118,7 +119,8 @@ STAGE PLANS:
               name: default.insert1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: create database x
 PREHOOK: type: CREATEDATABASE
@@ -180,7 +182,8 @@ STAGE PLANS:
               name: x.insert1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: explain insert into table default.INSERT1 select a.key, 
a.value from insert2 a WHERE (a.key=-1)
 PREHOOK: type: QUERY
@@ -228,7 +231,8 @@ STAGE PLANS:
               name: default.insert1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: explain
 from insert2
@@ -299,7 +303,8 @@ STAGE PLANS:
               name: default.insert1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -312,7 +317,8 @@ STAGE PLANS:
               name: x.insert1
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: CREATE DATABASE db2
 PREHOOK: type: CREATEDATABASE

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/insert_into1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/insert_into1.q.out 
b/ql/src/test/results/clientpositive/spark/insert_into1.q.out
index dff389d..4a5c3b8 100644
--- a/ql/src/test/results/clientpositive/spark/insert_into1.q.out
+++ b/ql/src/test/results/clientpositive/spark/insert_into1.q.out
@@ -74,7 +74,8 @@ STAGE PLANS:
               name: default.insert_into1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * from src ORDER BY key 
LIMIT 100
 PREHOOK: type: QUERY
@@ -188,7 +189,8 @@ STAGE PLANS:
               name: default.insert_into1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT INTO TABLE insert_into1 SELECT * FROM src ORDER BY key 
LIMIT 100
 PREHOOK: type: QUERY
@@ -302,7 +304,8 @@ STAGE PLANS:
               name: default.insert_into1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src ORDER BY 
key LIMIT 10
 PREHOOK: type: QUERY
@@ -396,7 +399,8 @@ STAGE PLANS:
               name: default.insert_into1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table insert_into1 select 1, 'a'
 PREHOOK: type: QUERY
@@ -452,7 +456,8 @@ STAGE PLANS:
               name: default.insert_into1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert into insert_into1 select 2, 'b'
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/insert_into2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/insert_into2.q.out 
b/ql/src/test/results/clientpositive/spark/insert_into2.q.out
index 329387d..6724963 100644
--- a/ql/src/test/results/clientpositive/spark/insert_into2.q.out
+++ b/ql/src/test/results/clientpositive/spark/insert_into2.q.out
@@ -80,7 +80,8 @@ STAGE PLANS:
               name: default.insert_into2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * 
FROM src order by key limit 100
 PREHOOK: type: QUERY
@@ -235,7 +236,8 @@ STAGE PLANS:
               name: default.insert_into2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 100
@@ -359,7 +361,8 @@ STAGE PLANS:
               name: default.insert_into2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src order by key LIMIT 50

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/insert_into3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/insert_into3.q.out 
b/ql/src/test/results/clientpositive/spark/insert_into3.q.out
index a6fac23..a75cb81 100644
--- a/ql/src/test/results/clientpositive/spark/insert_into3.q.out
+++ b/ql/src/test/results/clientpositive/spark/insert_into3.q.out
@@ -125,7 +125,8 @@ STAGE PLANS:
               name: default.insert_into3a
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -138,7 +139,8 @@ STAGE PLANS:
               name: default.insert_into3b
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src INSERT INTO TABLE insert_into3a SELECT * ORDER BY 
key, value LIMIT 50
          INSERT INTO TABLE insert_into3b SELECT * ORDER BY key, value LIMIT 100
@@ -274,7 +276,8 @@ STAGE PLANS:
               name: default.insert_into3a
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -287,7 +290,8 @@ STAGE PLANS:
               name: default.insert_into3b
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src INSERT OVERWRITE TABLE insert_into3a SELECT * LIMIT 10
          INSERT INTO TABLE insert_into3b SELECT * LIMIT 10

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join1.q.out 
b/ql/src/test/results/clientpositive/spark/join1.q.out
index a0ee4ea..d89d3e5 100644
--- a/ql/src/test/results/clientpositive/spark/join1.q.out
+++ b/ql/src/test/results/clientpositive/spark/join1.q.out
@@ -95,7 +95,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key)
 INSERT OVERWRITE TABLE dest_j1 SELECT src1.key, src2.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join14.q.out 
b/ql/src/test/results/clientpositive/spark/join14.q.out
index e804a1d..11edde0 100644
--- a/ql/src/test/results/clientpositive/spark/join14.q.out
+++ b/ql/src/test/results/clientpositive/spark/join14.q.out
@@ -95,7 +95,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src JOIN srcpart ON src.key = srcpart.key AND srcpart.ds 
= '2008-04-08' and src.key > 100
 INSERT OVERWRITE TABLE dest1 SELECT src.key, srcpart.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join17.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join17.q.out 
b/ql/src/test/results/clientpositive/spark/join17.q.out
index 3644efd..e8619fe 100644
--- a/ql/src/test/results/clientpositive/spark/join17.q.out
+++ b/ql/src/test/results/clientpositive/spark/join17.q.out
@@ -251,7 +251,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join2.q.out 
b/ql/src/test/results/clientpositive/spark/join2.q.out
index f684beb..d2d6b1d 100644
--- a/ql/src/test/results/clientpositive/spark/join2.q.out
+++ b/ql/src/test/results/clientpositive/spark/join2.q.out
@@ -129,7 +129,8 @@ STAGE PLANS:
               name: default.dest_j2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src 
src3 ON (src1.key + src2.key = src3.key)
 INSERT OVERWRITE TABLE dest_j2 SELECT src1.key, src3.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join25.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join25.q.out 
b/ql/src/test/results/clientpositive/spark/join25.q.out
index 05e5e70..0514466 100644
--- a/ql/src/test/results/clientpositive/spark/join25.q.out
+++ b/ql/src/test/results/clientpositive/spark/join25.q.out
@@ -98,7 +98,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(x) */ x.key, x.value, y.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join26.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join26.q.out 
b/ql/src/test/results/clientpositive/spark/join26.q.out
index ccd4526..e8186ab 100644
--- a/ql/src/test/results/clientpositive/spark/join26.q.out
+++ b/ql/src/test/results/clientpositive/spark/join26.q.out
@@ -329,7 +329,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join27.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join27.q.out 
b/ql/src/test/results/clientpositive/spark/join27.q.out
index e10d2fb..40a91e7 100644
--- a/ql/src/test/results/clientpositive/spark/join27.q.out
+++ b/ql/src/test/results/clientpositive/spark/join27.q.out
@@ -98,7 +98,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(x) */ x.key, x.value, y.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join28.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join28.q.out 
b/ql/src/test/results/clientpositive/spark/join28.q.out
index 8d4d870..4a3343a 100644
--- a/ql/src/test/results/clientpositive/spark/join28.q.out
+++ b/ql/src/test/results/clientpositive/spark/join28.q.out
@@ -136,7 +136,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT subq.key1, z.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join29.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join29.q.out 
b/ql/src/test/results/clientpositive/spark/join29.q.out
index 88929fe..8477a7e 100644
--- a/ql/src/test/results/clientpositive/spark/join29.q.out
+++ b/ql/src/test/results/clientpositive/spark/join29.q.out
@@ -136,7 +136,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT subq1.key, subq1.cnt, subq2.cnt

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join3.q.out 
b/ql/src/test/results/clientpositive/spark/join3.q.out
index e50f091..5ee3c52 100644
--- a/ql/src/test/results/clientpositive/spark/join3.q.out
+++ b/ql/src/test/results/clientpositive/spark/join3.q.out
@@ -114,7 +114,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM src src1 JOIN src src2 ON (src1.key = src2.key) JOIN src 
src3 ON (src1.key = src3.key)
 INSERT OVERWRITE TABLE dest1 SELECT src1.key, src3.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join30.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join30.q.out 
b/ql/src/test/results/clientpositive/spark/join30.q.out
index 23650ff..5bfa57b 100644
--- a/ql/src/test/results/clientpositive/spark/join30.q.out
+++ b/ql/src/test/results/clientpositive/spark/join30.q.out
@@ -118,7 +118,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(x) */ x.key, count(1) FROM src1 x JOIN src y ON (x.key = 
y.key) group by x.key

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join31.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join31.q.out 
b/ql/src/test/results/clientpositive/spark/join31.q.out
index 4edb4ef..7eaaff9 100644
--- a/ql/src/test/results/clientpositive/spark/join31.q.out
+++ b/ql/src/test/results/clientpositive/spark/join31.q.out
@@ -143,7 +143,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT subq1.key, count(1) as cnt

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join32.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join32.q.out 
b/ql/src/test/results/clientpositive/spark/join32.q.out
index 3521f2b..80e8f35 100644
--- a/ql/src/test/results/clientpositive/spark/join32.q.out
+++ b/ql/src/test/results/clientpositive/spark/join32.q.out
@@ -335,7 +335,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out 
b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
index 2a6b9b6..d3e648f 100644
--- a/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
+++ b/ql/src/test/results/clientpositive/spark/join32_lessSize.q.out
@@ -343,7 +343,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1
@@ -880,7 +881,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1
@@ -1330,7 +1332,8 @@ STAGE PLANS:
               name: default.dest_j2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j2
@@ -1778,7 +1781,8 @@ STAGE PLANS:
               name: default.dest_j2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j2
@@ -2035,7 +2039,8 @@ STAGE PLANS:
               name: default.dest_j2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j2
 SELECT res.key, x.value, res.value  
@@ -2279,7 +2284,8 @@ STAGE PLANS:
               name: default.dest_j2
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j2
 SELECT res.key, y.value, res.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join33.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join33.q.out 
b/ql/src/test/results/clientpositive/spark/join33.q.out
index 3521f2b..80e8f35 100644
--- a/ql/src/test/results/clientpositive/spark/join33.q.out
+++ b/ql/src/test/results/clientpositive/spark/join33.q.out
@@ -335,7 +335,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join34.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join34.q.out 
b/ql/src/test/results/clientpositive/spark/join34.q.out
index 503235f..2c9fb99 100644
--- a/ql/src/test/results/clientpositive/spark/join34.q.out
+++ b/ql/src/test/results/clientpositive/spark/join34.q.out
@@ -337,7 +337,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join35.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join35.q.out 
b/ql/src/test/results/clientpositive/spark/join35.q.out
index 54f68af..86ccc5a 100644
--- a/ql/src/test/results/clientpositive/spark/join35.q.out
+++ b/ql/src/test/results/clientpositive/spark/join35.q.out
@@ -379,7 +379,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join36.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join36.q.out 
b/ql/src/test/results/clientpositive/spark/join36.q.out
index b1717e0..b469fc3 100644
--- a/ql/src/test/results/clientpositive/spark/join36.q.out
+++ b/ql/src/test/results/clientpositive/spark/join36.q.out
@@ -138,7 +138,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(x) */ x.key, x.cnt, y.cnt

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join37.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join37.q.out 
b/ql/src/test/results/clientpositive/spark/join37.q.out
index 327e93e..8dc4078 100644
--- a/ql/src/test/results/clientpositive/spark/join37.q.out
+++ b/ql/src/test/results/clientpositive/spark/join37.q.out
@@ -98,7 +98,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1 
 SELECT /*+ MAPJOIN(X) */ x.key, x.value, y.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join39.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join39.q.out 
b/ql/src/test/results/clientpositive/spark/join39.q.out
index 8f0ba62..c094dd9 100644
--- a/ql/src/test/results/clientpositive/spark/join39.q.out
+++ b/ql/src/test/results/clientpositive/spark/join39.q.out
@@ -91,7 +91,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1
 SELECT /*+ MAPJOIN(y) */ x.key, x.value, y.key, y.value

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join4.q.out 
b/ql/src/test/results/clientpositive/spark/join4.q.out
index 7e1d473..44ec2e0 100644
--- a/ql/src/test/results/clientpositive/spark/join4.q.out
+++ b/ql/src/test/results/clientpositive/spark/join4.q.out
@@ -118,7 +118,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
  FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join5.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join5.q.out 
b/ql/src/test/results/clientpositive/spark/join5.q.out
index c354a0e..37a96d7 100644
--- a/ql/src/test/results/clientpositive/spark/join5.q.out
+++ b/ql/src/test/results/clientpositive/spark/join5.q.out
@@ -118,7 +118,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
  FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join6.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join6.q.out 
b/ql/src/test/results/clientpositive/spark/join6.q.out
index c488247..563c940 100644
--- a/ql/src/test/results/clientpositive/spark/join6.q.out
+++ b/ql/src/test/results/clientpositive/spark/join6.q.out
@@ -118,7 +118,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
  FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join7.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join7.q.out 
b/ql/src/test/results/clientpositive/spark/join7.q.out
index d9b7c05..86838cc 100644
--- a/ql/src/test/results/clientpositive/spark/join7.q.out
+++ b/ql/src/test/results/clientpositive/spark/join7.q.out
@@ -148,7 +148,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
  FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join8.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join8.q.out 
b/ql/src/test/results/clientpositive/spark/join8.q.out
index ae308b0..e6b7c1f 100644
--- a/ql/src/test/results/clientpositive/spark/join8.q.out
+++ b/ql/src/test/results/clientpositive/spark/join8.q.out
@@ -121,7 +121,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: FROM (
  FROM 

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join9.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join9.q.out 
b/ql/src/test/results/clientpositive/spark/join9.q.out
index c7a191a..76534ad 100644
--- a/ql/src/test/results/clientpositive/spark/join9.q.out
+++ b/ql/src/test/results/clientpositive/spark/join9.q.out
@@ -252,7 +252,8 @@ STAGE PLANS:
               name: default.dest1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: FROM srcpart src1 JOIN src src2 ON (src1.key = src2.key)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out 
b/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out
index 86f3d9a..d2c674e 100644
--- a/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out
+++ b/ql/src/test/results/clientpositive/spark/join_map_ppr.q.out
@@ -319,7 +319,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1
@@ -811,7 +812,8 @@ STAGE PLANS:
               name: default.dest_j1
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: INSERT OVERWRITE TABLE dest_j1

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out 
b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
index de3af40..8636307 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_10.q.out
@@ -153,7 +153,8 @@ STAGE PLANS:
               name: default.list_bucketing_static_part
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: insert overwrite table list_bucketing_static_part partition 
(ds = '2008-04-08', hr = '11')

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out 
b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
index 6427f70..10a3892 100644
--- a/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
+++ b/ql/src/test/results/clientpositive/spark/list_bucket_dml_2.q.out
@@ -204,7 +204,8 @@ STAGE PLANS:
               name: default.list_bucketing_static_part
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 #### A masked pattern was here ####
 
 PREHOOK: query: insert overwrite table list_bucketing_static_part partition 
(ds = '2008-04-08', hr = '11')

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
index 99ebfbd..9c62fb3 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part1.q.out
@@ -113,7 +113,8 @@ STAGE PLANS:
               name: default.nzhang_part1
 
   Stage: Stage-3
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
   Stage: Stage-1
     Move Operator
@@ -129,7 +130,8 @@ STAGE PLANS:
               name: default.nzhang_part2
 
   Stage: Stage-4
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from srcpart
 insert overwrite table nzhang_part1 partition (ds, hr) select key, value, ds, 
hr where ds <= '2008-04-08'

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
index 24c76c2..ad4668e 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part10.q.out
@@ -83,7 +83,8 @@ STAGE PLANS:
               name: default.nzhang_part10
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: from srcpart
 insert overwrite table nzhang_part10 partition(ds='2008-12-31', hr) select 
key, value, hr where ds > '2008-04-08'

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
index 4318004..5c7e63c 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part13.q.out
@@ -120,7 +120,8 @@ STAGE PLANS:
               name: default.nzhang_part13
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table nzhang_part13 partition 
(ds="2010-03-03", hr) 
 select * from (

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
index 7a562e4..08d6350 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part14.q.out
@@ -135,7 +135,8 @@ STAGE PLANS:
               name: default.nzhang_part14
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table nzhang_part14 partition(value) 
 select key, value from (

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
index 9bdd77b..6a7bb4d 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part2.q.out
@@ -88,7 +88,8 @@ STAGE PLANS:
               name: default.nzhang_part_bucket
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table nzhang_part_bucket partition 
(ds='2010-03-23', hr) select key, value, hr from srcpart where ds is not null 
and hr is not null
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
index 0d4b21a..ca6729a 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part3.q.out
@@ -81,7 +81,8 @@ STAGE PLANS:
               name: default.nzhang_part3
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table nzhang_part3 partition (ds, hr) select 
key, value, ds, hr from srcpart where ds is not null and hr is not null
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out 
b/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
index 937b9d0..368c08a 100644
--- a/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
+++ b/ql/src/test/results/clientpositive/spark/load_dyn_part4.q.out
@@ -91,7 +91,8 @@ STAGE PLANS:
               name: default.nzhang_part4
 
   Stage: Stage-2
-    Stats-Aggr Operator
+    Stats Work
+      Basic Stats Work:
 
 PREHOOK: query: insert overwrite table nzhang_part4 partition (ds, hr) select 
key, value, ds, hr from srcpart where ds is not null and hr is not null
 PREHOOK: type: QUERY

Reply via email to