You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by ha...@apache.org on 2014/10/02 23:33:41 UTC

svn commit: r1629074 - in /hive/branches/branch-0.14/ql/src: java/org/apache/hadoop/hive/ql/metadata/ test/queries/clientpositive/ test/results/clientpositive/ test/results/clientpositive/tez/

Author: hashutosh
Date: Thu Oct  2 21:33:40 2014
New Revision: 1629074

URL: http://svn.apache.org/r1629074
Log:
HIVE-7695 : hive stats issue when insert query is appending data into table (Ashutosh Chauhan via Prashanth J)

Modified:
    hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
    hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into1.q
    hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into2.q
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketcontext_5.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into1.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into4.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into5.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/stats11.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into1.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into2.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out
    hive/branches/branch-0.14/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out

Modified: hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java (original)
+++ hive/branches/branch-0.14/ql/src/java/org/apache/hadoop/hive/ql/metadata/Hive.java Thu Oct  2 21:33:40 2014
@@ -1565,6 +1565,7 @@ private void constructOneLBLocationMap(F
       tbl.replaceFiles(loadPath, isSrcLocal);
     } else {
       tbl.copyFiles(loadPath, isSrcLocal, isAcid);
+      tbl.getParameters().put(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK, "true");
     }
 
     try {
@@ -1678,17 +1679,6 @@ private void constructOneLBLocationMap(F
     return getPartition(tbl, partSpec, forceCreate, null, true);
   }
 
-  private static void clearPartitionStats(org.apache.hadoop.hive.metastore.api.Partition tpart) {
-    Map<String,String> tpartParams = tpart.getParameters();
-    if (tpartParams == null) {
-      return;
-    }
-
-    for (String statType : StatsSetupConst.supportedStats) {
-      tpartParams.remove(statType);
-    }
-  }
-
   /**
    * Returns partition metadata
    *
@@ -1756,7 +1746,7 @@ private void constructOneLBLocationMap(F
             throw new HiveException("new partition path should not be null or empty.");
           }
           tpart.getSd().setLocation(partPath);
-          clearPartitionStats(tpart);
+          tpart.getParameters().put(StatsSetupConst.STATS_GENERATED_VIA_STATS_TASK,"true");
           String fullName = tbl.getTableName();
           if (!org.apache.commons.lang.StringUtils.isEmpty(tbl.getDbName())) {
             fullName = tbl.getDbName() + "." + tbl.getTableName();

Modified: hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into1.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into1.q?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into1.q (original)
+++ hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into1.q Thu Oct  2 21:33:40 2014
@@ -1,3 +1,4 @@
+set hive.compute.query.using.stats=true;
 DROP TABLE insert_into1;
 
 CREATE TABLE insert_into1 (key int, value string);
@@ -7,14 +8,18 @@ INSERT INTO TABLE insert_into1 SELECT * 
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t;
-
+explain 
+select count(*) from insert_into1;
+select count(*) from insert_into1;
 EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100;
 INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100;
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t;
 
+explain
 SELECT COUNT(*) FROM insert_into1;
+select count(*) from insert_into1;
 
 EXPLAIN INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10;
 INSERT OVERWRITE TABLE insert_into1 SELECT * FROM src LIMIT 10;
@@ -22,5 +27,10 @@ SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into1
 ) t;
 
+explain
+SELECT COUNT(*) FROM insert_into1;
+select count(*) from insert_into1;
 
 DROP TABLE insert_into1;
+
+set hive.compute.query.using.stats=false;

Modified: hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into2.q
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into2.q?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into2.q (original)
+++ hive/branches/branch-0.14/ql/src/test/queries/clientpositive/insert_into2.q Thu Oct  2 21:33:40 2014
@@ -1,3 +1,4 @@
+set hive.compute.query.using.stats=true;
 DROP TABLE insert_into2;
 CREATE TABLE insert_into2 (key int, value string) 
   PARTITIONED BY (ds string);
@@ -5,7 +6,12 @@ CREATE TABLE insert_into2 (key int, valu
 EXPLAIN INSERT INTO TABLE insert_into2 PARTITION (ds='1') 
   SELECT * FROM src LIMIT 100;
 INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100;
+explain
+select count (*) from insert_into2 where ds = '1';
+select count (*) from insert_into2 where ds = '1';
 INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100;
+explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='1';
 SELECT COUNT(*) FROM insert_into2 WHERE ds='1';
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
@@ -19,6 +25,9 @@ INSERT OVERWRITE TABLE insert_into2 PART
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
 ) t;
+explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2';
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2';
 
 EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src LIMIT 50;
@@ -27,5 +36,11 @@ INSERT OVERWRITE TABLE insert_into2 PART
 SELECT SUM(HASH(c)) FROM (
     SELECT TRANSFORM(*) USING 'tr \t _' AS (c) FROM insert_into2
 ) t;
+explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2';
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2';
+
 
 DROP TABLE insert_into2;
+
+set hive.compute.query.using.stats=false;

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_merge_stats_orc.q.out Thu Oct  2 21:33:40 2014
@@ -247,8 +247,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	3                   
-	numRows             	500                 
-	rawDataSize         	47000               
+	numRows             	1500                
+	rawDataSize         	141000              
 	totalSize           	7488                
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_partition_coltype.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_partition_coltype.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_partition_coltype.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/alter_partition_coltype.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/auto_sortmerge_join_5.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketcontext_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketcontext_5.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketcontext_5.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketcontext_5.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin1.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin1.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin1.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin4.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin4.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin4.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative2.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/bucketmapjoin_negative3.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/columnstats_tbllvl.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/display_colstats_tbllvl.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_opt_vectorization.q.out Thu Oct  2 21:33:40 2014
@@ -878,8 +878,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	1348                
 #### A masked pattern was here ####
 	 	 
@@ -922,8 +922,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	1050                
 #### A masked pattern was here ####
 	 	 
@@ -966,8 +966,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	7                   
-	rawDataSize         	140                 
+	numRows             	14                  
+	rawDataSize         	280                 
 	totalSize           	1166                
 #### A masked pattern was here ####
 	 	 
@@ -1010,8 +1010,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	1050                
 #### A masked pattern was here ####
 	 	 
@@ -1053,8 +1053,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	4340                
 #### A masked pattern was here ####
 	 	 
@@ -1096,8 +1096,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	2094                
 #### A masked pattern was here ####
 	 	 
@@ -1139,8 +1139,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	4326                
 #### A masked pattern was here ####
 	 	 
@@ -1182,8 +1182,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	2094                
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/dynpart_sort_optimization.q.out Thu Oct  2 21:33:40 2014
@@ -783,8 +783,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -827,8 +827,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -871,8 +871,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	7                   
-	rawDataSize         	181                 
+	numRows             	14                  
+	rawDataSize         	362                 
 	totalSize           	376                 
 #### A masked pattern was here ####
 	 	 
@@ -915,8 +915,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -958,8 +958,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -1001,8 +1001,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -1044,8 +1044,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -1087,8 +1087,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into1.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into1.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into1.q.out Thu Oct  2 21:33:40 2014
@@ -94,6 +94,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 10226524244
+PREHOOK: query: explain 
+select count(*) from insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+select count(*) from insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+POSTHOOK: query: select count(*) from insert_into1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+100
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
@@ -178,11 +203,27 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 20453048488
-PREHOOK: query: SELECT COUNT(*) FROM insert_into1
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT COUNT(*) FROM insert_into1
+POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
@@ -271,6 +312,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 -826625916
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+POSTHOOK: query: select count(*) from insert_into1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+10
 PREHOOK: query: DROP TABLE insert_into1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@insert_into1

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into2.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into2.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into2.q.out Thu Oct  2 21:33:40 2014
@@ -87,6 +87,31 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: explain
+select count (*) from insert_into2 where ds = '1'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count (*) from insert_into2 where ds = '1'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count (*) from insert_into2 where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: select count (*) from insert_into2 where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+100
 PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -97,15 +122,29 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
 PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-PREHOOK: Input: default@insert_into2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-POSTHOOK: Input: default@insert_into2@ds=1
 #### A masked pattern was here ####
 200
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
@@ -217,6 +256,31 @@ POSTHOOK: Input: default@insert_into2@ds
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
 -36239931656
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+100
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src LIMIT 50
 PREHOOK: type: QUERY
@@ -311,6 +375,31 @@ POSTHOOK: Input: default@insert_into2@ds
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
 -27100860056
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+50
 PREHOOK: query: DROP TABLE insert_into2
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@insert_into2

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into4.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into4.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into4.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into4.q.out Thu Oct  2 21:33:40 2014
@@ -214,14 +214,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: insert_into4a
-            Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 10 Data size: 104 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 20 Data size: 208 Basic stats: COMPLETE Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into5.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into5.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/insert_into5.q.out Thu Oct  2 21:33:40 2014
@@ -233,14 +233,14 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: insert_into5a
-            Statistics: Num rows: 10 Data size: 50 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 20 Data size: 100 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: key (type: int), value (type: string)
               outputColumnNames: _col0, _col1
-              Statistics: Num rows: 10 Data size: 50 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 20 Data size: 100 Basic stats: COMPLETE Column stats: NONE
               File Output Operator
                 compressed: false
-                Statistics: Num rows: 10 Data size: 50 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 20 Data size: 100 Basic stats: COMPLETE Column stats: NONE
                 table:
                     input format: org.apache.hadoop.mapred.TextInputFormat
                     output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/mapjoin_test_outer.q.out Thu Oct  2 21:33:40 2014
@@ -275,7 +275,7 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Statistics: Num rows: 1 Data size: 13 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 9 Data size: 40 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
                 0 {value}
@@ -1108,7 +1108,7 @@ STAGE PLANS:
         src2 
           TableScan
             alias: src2
-            Statistics: Num rows: 1 Data size: 13 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 9 Data size: 40 Basic stats: COMPLETE Column stats: NONE
             HashTable Sink Operator
               condition expressions:
                 0 {value}

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/stats11.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/stats11.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/stats11.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/stats11.q.out Thu Oct  2 21:33:40 2014
@@ -535,8 +535,6 @@ STAGE PLANS:
 #### A masked pattern was here ####
               name default.srcbucket_mapjoin
               numFiles 2
-              numRows 0
-              rawDataSize 0
               serialization.ddl struct srcbucket_mapjoin { i32 key, string value}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -556,8 +554,6 @@ STAGE PLANS:
 #### A masked pattern was here ####
                 name default.srcbucket_mapjoin
                 numFiles 2
-                numRows 0
-                rawDataSize 0
                 serialization.ddl struct srcbucket_mapjoin { i32 key, string value}
                 serialization.format 1
                 serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/temp_table_display_colstats_tbllvl.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/alter_merge_stats_orc.q.out Thu Oct  2 21:33:40 2014
@@ -247,8 +247,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	3                   
-	numRows             	500                 
-	rawDataSize         	47000               
+	numRows             	1500                
+	rawDataSize         	141000              
 	totalSize           	7488                
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
Files hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out (original) and hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/auto_sortmerge_join_5.q.out Thu Oct  2 21:33:40 2014 differ

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_opt_vectorization.q.out Thu Oct  2 21:33:40 2014
@@ -930,8 +930,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	1348                
 #### A masked pattern was here ####
 	 	 
@@ -974,8 +974,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	1050                
 #### A masked pattern was here ####
 	 	 
@@ -1018,8 +1018,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	7                   
-	rawDataSize         	140                 
+	numRows             	14                  
+	rawDataSize         	280                 
 	totalSize           	1166                
 #### A masked pattern was here ####
 	 	 
@@ -1062,8 +1062,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	1050                
 #### A masked pattern was here ####
 	 	 
@@ -1105,8 +1105,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	4340                
 #### A masked pattern was here ####
 	 	 
@@ -1148,8 +1148,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	2094                
 #### A masked pattern was here ####
 	 	 
@@ -1191,8 +1191,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	320                 
+	numRows             	32                  
+	rawDataSize         	640                 
 	totalSize           	4326                
 #### A masked pattern was here ####
 	 	 
@@ -1234,8 +1234,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	60                  
+	numRows             	6                   
+	rawDataSize         	120                 
 	totalSize           	2094                
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/dynpart_sort_optimization.q.out Thu Oct  2 21:33:40 2014
@@ -843,8 +843,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -887,8 +887,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -931,8 +931,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	7                   
-	rawDataSize         	181                 
+	numRows             	14                  
+	rawDataSize         	362                 
 	totalSize           	376                 
 #### A masked pattern was here ####
 	 	 
@@ -975,8 +975,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	2                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -1018,8 +1018,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -1061,8 +1061,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 
@@ -1104,8 +1104,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	16                  
-	rawDataSize         	415                 
+	numRows             	32                  
+	rawDataSize         	830                 
 	totalSize           	862                 
 #### A masked pattern was here ####
 	 	 
@@ -1147,8 +1147,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	8                   
-	numRows             	3                   
-	rawDataSize         	78                  
+	numRows             	6                   
+	rawDataSize         	156                 
 	totalSize           	162                 
 #### A masked pattern was here ####
 	 	 

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into1.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into1.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into1.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into1.q.out Thu Oct  2 21:33:40 2014
@@ -104,6 +104,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 10226524244
+PREHOOK: query: explain 
+select count(*) from insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain 
+select count(*) from insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+POSTHOOK: query: select count(*) from insert_into1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+100
 PREHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
 PREHOOK: type: QUERY
 POSTHOOK: query: EXPLAIN INSERT INTO TABLE insert_into1 SELECT * FROM src LIMIT 100
@@ -198,11 +223,27 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 20453048488
-PREHOOK: query: SELECT COUNT(*) FROM insert_into1
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
-POSTHOOK: query: SELECT COUNT(*) FROM insert_into1
+POSTHOOK: query: select count(*) from insert_into1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
@@ -301,6 +342,31 @@ POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into1
 #### A masked pattern was here ####
 -826625916
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into1
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count(*) from insert_into1
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+POSTHOOK: query: select count(*) from insert_into1
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into1
+#### A masked pattern was here ####
+10
 PREHOOK: query: DROP TABLE insert_into1
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@insert_into1

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into2.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into2.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into2.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/insert_into2.q.out Thu Oct  2 21:33:40 2014
@@ -97,6 +97,31 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: explain
+select count (*) from insert_into2 where ds = '1'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+select count (*) from insert_into2 where ds = '1'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: select count (*) from insert_into2 where ds = '1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: select count (*) from insert_into2 where ds = '1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+100
 PREHOOK: query: INSERT INTO TABLE insert_into2 PARTITION (ds='1') SELECT * FROM src limit 100
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src
@@ -107,15 +132,29 @@ POSTHOOK: Input: default@src
 POSTHOOK: Output: default@insert_into2@ds=1
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).key EXPRESSION [(src)src.FieldSchema(name:key, type:string, comment:default), ]
 POSTHOOK: Lineage: insert_into2 PARTITION(ds=1).value SIMPLE [(src)src.FieldSchema(name:value, type:string, comment:default), ]
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
 PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@insert_into2
-PREHOOK: Input: default@insert_into2@ds=1
 #### A masked pattern was here ####
 POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='1'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@insert_into2
-POSTHOOK: Input: default@insert_into2@ds=1
 #### A masked pattern was here ####
 200
 PREHOOK: query: SELECT SUM(HASH(c)) FROM (
@@ -237,6 +276,31 @@ POSTHOOK: Input: default@insert_into2@ds
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
 -36239931656
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+100
 PREHOOK: query: EXPLAIN INSERT OVERWRITE TABLE insert_into2 PARTITION (ds='2')
   SELECT * FROM src LIMIT 50
 PREHOOK: type: QUERY
@@ -341,6 +405,31 @@ POSTHOOK: Input: default@insert_into2@ds
 POSTHOOK: Input: default@insert_into2@ds=2
 #### A masked pattern was here ####
 -27100860056
+PREHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+POSTHOOK: query: explain
+SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+STAGE DEPENDENCIES:
+  Stage-0 is a root stage
+
+STAGE PLANS:
+  Stage: Stage-0
+    Fetch Operator
+      limit: 1
+      Processor Tree:
+        ListSink
+
+PREHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+POSTHOOK: query: SELECT COUNT(*) FROM insert_into2 WHERE ds='2'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@insert_into2
+#### A masked pattern was here ####
+50
 PREHOOK: query: DROP TABLE insert_into2
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@insert_into2

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/tez/vectorized_timestamp_funcs.q.out Thu Oct  2 21:33:40 2014
@@ -545,15 +545,15 @@ STAGE PLANS:
             Map Operator Tree:
                 TableScan
                   alias: alltypesorc_wrong
-                  Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                   Select Operator
                     expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int)
                     outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
-                    Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                    Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                     Reduce Output Operator
                       key expressions: _col0 (type: bigint)
                       sort order: +
-                      Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                      Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                       value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
             Execution mode: vectorized
         Reducer 2 
@@ -561,10 +561,10 @@ STAGE PLANS:
               Select Operator
                 expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
                 outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
-                Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                 File Output Operator
                   compressed: false
-                  Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                  Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                   table:
                       input format: org.apache.hadoop.mapred.TextInputFormat
                       output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat

Modified: hive/branches/branch-0.14/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out
URL: http://svn.apache.org/viewvc/hive/branches/branch-0.14/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out?rev=1629074&r1=1629073&r2=1629074&view=diff
==============================================================================
--- hive/branches/branch-0.14/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out (original)
+++ hive/branches/branch-0.14/ql/src/test/results/clientpositive/vectorized_timestamp_funcs.q.out Thu Oct  2 21:33:40 2014
@@ -519,25 +519,25 @@ STAGE PLANS:
       Map Operator Tree:
           TableScan
             alias: alltypesorc_wrong
-            Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
             Select Operator
               expressions: to_unix_timestamp(stimestamp1) (type: bigint), year(stimestamp1) (type: int), month(stimestamp1) (type: int), day(stimestamp1) (type: int), dayofmonth(stimestamp1) (type: int), weekofyear(stimestamp1) (type: int), hour(stimestamp1) (type: int), minute(stimestamp1) (type: int), second(stimestamp1) (type: int)
               outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
-              Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+              Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
               Reduce Output Operator
                 key expressions: _col0 (type: bigint)
                 sort order: +
-                Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+                Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
                 value expressions: _col1 (type: int), _col2 (type: int), _col3 (type: int), _col4 (type: int), _col5 (type: int), _col6 (type: int), _col7 (type: int), _col8 (type: int)
       Execution mode: vectorized
       Reduce Operator Tree:
         Select Operator
           expressions: KEY.reducesinkkey0 (type: bigint), VALUE._col0 (type: int), VALUE._col1 (type: int), VALUE._col2 (type: int), VALUE._col3 (type: int), VALUE._col4 (type: int), VALUE._col5 (type: int), VALUE._col6 (type: int), VALUE._col7 (type: int)
           outputColumnNames: _col0, _col1, _col2, _col3, _col4, _col5, _col6, _col7, _col8
-          Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+          Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
           File Output Operator
             compressed: false
-            Statistics: Num rows: 1 Data size: 103 Basic stats: COMPLETE Column stats: NONE
+            Statistics: Num rows: 3 Data size: 294 Basic stats: COMPLETE Column stats: NONE
             table:
                 input format: org.apache.hadoop.mapred.TextInputFormat
                 output format: org.apache.hadoop.hive.ql.io.HiveIgnoreKeyTextOutputFormat