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 2017/11/07 22:33:55 UTC

[18/22] hive git commit: HIVE-16827 : Merge stats task and column stats task into a single task (Zoltan Haindrich via Ashutosh Chauhan)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/queries/clientpositive/temp_table_display_colstats_tbllvl.q
----------------------------------------------------------------------
diff --git a/ql/src/test/queries/clientpositive/temp_table_display_colstats_tbllvl.q b/ql/src/test/queries/clientpositive/temp_table_display_colstats_tbllvl.q
index 39a11f2..e121583 100644
--- a/ql/src/test/queries/clientpositive/temp_table_display_colstats_tbllvl.q
+++ b/ql/src/test/queries/clientpositive/temp_table_display_colstats_tbllvl.q
@@ -15,8 +15,11 @@ CREATE TEMPORARY EXTERNAL TABLE UserVisits_web_text_none (
 row format delimited fields terminated by '|'  stored as textfile
 location 'pfile://${system:test.tmp.dir}/uservisits_web_text_none';
 
+desc formatted UserVisits_web_text_none;
+
 LOAD DATA LOCAL INPATH "../../data/files/UserVisits.dat" INTO TABLE UserVisits_web_text_none;
 
+desc formatted UserVisits_web_text_none;
 desc extended UserVisits_web_text_none sourceIP;
 desc formatted UserVisits_web_text_none sourceIP;
 
@@ -27,6 +30,7 @@ explain extended
 analyze table UserVisits_web_text_none compute statistics for columns sourceIP, avgTimeOnSite, adRevenue;
 
 analyze table UserVisits_web_text_none compute statistics for columns sourceIP, avgTimeOnSite, adRevenue;
+desc formatted UserVisits_web_text_none;
 desc formatted UserVisits_web_text_none sourceIP;
 desc formatted UserVisits_web_text_none avgTimeOnSite;
 desc formatted UserVisits_web_text_none adRevenue;

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/acid_table_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/acid_table_stats.q.out b/ql/src/test/results/clientpositive/acid_table_stats.q.out
index 32c8531..351ff0d 100644
--- a/ql/src/test/results/clientpositive/acid_table_stats.q.out
+++ b/ql/src/test/results/clientpositive/acid_table_stats.q.out
@@ -91,6 +91,7 @@ Database:           	default
 Table:              	acid                	 
 #### A masked pattern was here ####
 Partition Parameters:	 	 
+	COLUMN_STATS_ACCURATE	{}                  
 	numFiles            	2                   
 	numRows             	0                   
 	rawDataSize         	0                   
@@ -226,11 +227,15 @@ PREHOOK: query: analyze table acid partition(ds='2008-04-08') compute statistics
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid
 PREHOOK: Input: default@acid@ds=2008-04-08
+PREHOOK: Output: default@acid
+PREHOOK: Output: default@acid@ds=2008-04-08
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table acid partition(ds='2008-04-08') compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid
 POSTHOOK: Input: default@acid@ds=2008-04-08
+POSTHOOK: Output: default@acid
+POSTHOOK: Output: default@acid@ds=2008-04-08
 #### A masked pattern was here ####
 PREHOOK: query: desc formatted acid partition(ds='2008-04-08')
 PREHOOK: type: DESCTABLE
@@ -378,6 +383,7 @@ Database:           	default
 Table:              	acid                	 
 #### A masked pattern was here ####
 Partition Parameters:	 	 
+	COLUMN_STATS_ACCURATE	{}                  
 	numFiles            	4                   
 	numRows             	1000                
 	rawDataSize         	208000              
@@ -502,11 +508,15 @@ PREHOOK: query: analyze table acid partition(ds='2008-04-08') compute statistics
 PREHOOK: type: QUERY
 PREHOOK: Input: default@acid
 PREHOOK: Input: default@acid@ds=2008-04-08
+PREHOOK: Output: default@acid
+PREHOOK: Output: default@acid@ds=2008-04-08
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table acid partition(ds='2008-04-08') compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@acid
 POSTHOOK: Input: default@acid@ds=2008-04-08
+POSTHOOK: Output: default@acid
+POSTHOOK: Output: default@acid@ds=2008-04-08
 #### A masked pattern was here ####
 PREHOOK: query: explain select max(key) from acid where ds='2008-04-08'
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
index 6b9b7e5..858e16f 100644
--- a/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
+++ b/ql/src/test/results/clientpositive/alterColumnStatsPart.q.out
@@ -154,11 +154,15 @@ PREHOOK: query: analyze table p partition(c=1) compute statistics for columns a
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p
 PREHOOK: Input: default@p@c=1
+PREHOOK: Output: default@p
+PREHOOK: Output: default@p@c=1
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table p partition(c=1) compute statistics for columns a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@p
 POSTHOOK: Input: default@p@c=1
+POSTHOOK: Output: default@p
+POSTHOOK: Output: default@p@c=1
 #### A masked pattern was here ####
 PREHOOK: query: explain select max(a) from p where c=1
 PREHOOK: type: QUERY
@@ -371,11 +375,15 @@ PREHOOK: query: analyze table p partition(c=100) compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p
 PREHOOK: Input: default@p@c=100
+PREHOOK: Output: default@p
+PREHOOK: Output: default@p@c=100
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table p partition(c=100) compute statistics for columns a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@p
 POSTHOOK: Input: default@p@c=100
+POSTHOOK: Output: default@p
+POSTHOOK: Output: default@p@c=100
 #### A masked pattern was here ####
 PREHOOK: query: explain select max(a) from p where c=100
 PREHOOK: type: QUERY
@@ -474,11 +482,15 @@ PREHOOK: query: analyze table p partition(c=100) compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@p
 PREHOOK: Input: default@p@c=100
+PREHOOK: Output: default@p
+PREHOOK: Output: default@p@c=100
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table p partition(c=100) compute statistics for columns a
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@p
 POSTHOOK: Input: default@p@c=100
+POSTHOOK: Output: default@p
+POSTHOOK: Output: default@p@c=100
 #### A masked pattern was here ####
 PREHOOK: query: explain select max(a) from p where c=100
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_partition_update_status.q.out b/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
index 37b24ed..9aab9b2 100644
--- a/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
+++ b/ql/src/test/results/clientpositive/alter_partition_update_status.q.out
@@ -22,11 +22,15 @@ PREHOOK: query: ANALYZE TABLE src_stat_part_one PARTITION(partitionId=1) COMPUTE
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_part_one
 PREHOOK: Input: default@src_stat_part_one@partitionid=1
+PREHOOK: Output: default@src_stat_part_one
+PREHOOK: Output: default@src_stat_part_one@partitionid=1
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_part_one PARTITION(partitionId=1) COMPUTE STATISTICS for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_part_one
 POSTHOOK: Input: default@src_stat_part_one@partitionid=1
+POSTHOOK: Output: default@src_stat_part_one
+POSTHOOK: Output: default@src_stat_part_one@partitionid=1
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_part_one PARTITION(partitionId=1) key
 PREHOOK: type: DESCTABLE
@@ -92,11 +96,15 @@ PREHOOK: query: ANALYZE TABLE src_stat_part_two PARTITION(px=1) COMPUTE STATISTI
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_part_two
 PREHOOK: Input: default@src_stat_part_two@px=1/py=a
+PREHOOK: Output: default@src_stat_part_two
+PREHOOK: Output: default@src_stat_part_two@px=1/py=a
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_part_two PARTITION(px=1) COMPUTE STATISTICS for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_part_two
 POSTHOOK: Input: default@src_stat_part_two@px=1/py=a
+POSTHOOK: Output: default@src_stat_part_two
+POSTHOOK: Output: default@src_stat_part_two@px=1/py=a
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_part_two PARTITION(px=1, py='a') key
 PREHOOK: type: DESCTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
index a648335..a8ef59c 100644
--- a/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_column_stats.q.out
@@ -77,10 +77,12 @@ PREHOOK: query: analyze table testtable0 compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: statsdb1@testtable0
 #### A masked pattern was here ####
+PREHOOK: Output: statsdb1@testtable0
 POSTHOOK: query: analyze table testtable0 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: statsdb1@testtable0
 #### A masked pattern was here ####
+POSTHOOK: Output: statsdb1@testtable0
 PREHOOK: query: describe formatted statsdb1.testtable0
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: statsdb1@testtable0
@@ -585,12 +587,18 @@ PREHOOK: Input: statsdb1@testpart0
 PREHOOK: Input: statsdb1@testpart0@part=part1
 PREHOOK: Input: statsdb1@testpart0@part=part2
 #### A masked pattern was here ####
+PREHOOK: Output: statsdb1@testpart0
+PREHOOK: Output: statsdb1@testpart0@part=part1
+PREHOOK: Output: statsdb1@testpart0@part=part2
 POSTHOOK: query: analyze table testpart0 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: statsdb1@testpart0
 POSTHOOK: Input: statsdb1@testpart0@part=part1
 POSTHOOK: Input: statsdb1@testpart0@part=part2
 #### A masked pattern was here ####
+POSTHOOK: Output: statsdb1@testpart0
+POSTHOOK: Output: statsdb1@testpart0@part=part1
+POSTHOOK: Output: statsdb1@testpart0@part=part2
 PREHOOK: query: describe formatted statsdb1.testpart0
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: statsdb1@testpart0
@@ -1939,10 +1947,12 @@ PREHOOK: query: analyze table testtable0 compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: statsdb1@testtable0
 #### A masked pattern was here ####
+PREHOOK: Output: statsdb1@testtable0
 POSTHOOK: query: analyze table testtable0 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: statsdb1@testtable0
 #### A masked pattern was here ####
+POSTHOOK: Output: statsdb1@testtable0
 PREHOOK: query: describe formatted statsdb1.testtable0
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: statsdb1@testtable0
@@ -2447,12 +2457,18 @@ PREHOOK: Input: statsdb1@testpart0
 PREHOOK: Input: statsdb1@testpart0@part=part1
 PREHOOK: Input: statsdb1@testpart0@part=part2
 #### A masked pattern was here ####
+PREHOOK: Output: statsdb1@testpart0
+PREHOOK: Output: statsdb1@testpart0@part=part1
+PREHOOK: Output: statsdb1@testpart0@part=part2
 POSTHOOK: query: analyze table testpart0 compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: statsdb1@testpart0
 POSTHOOK: Input: statsdb1@testpart0@part=part1
 POSTHOOK: Input: statsdb1@testpart0@part=part2
 #### A masked pattern was here ####
+POSTHOOK: Output: statsdb1@testpart0
+POSTHOOK: Output: statsdb1@testpart0@part=part1
+POSTHOOK: Output: statsdb1@testpart0@part=part2
 PREHOOK: query: describe formatted statsdb1.testpart0
 PREHOOK: type: DESCTABLE
 PREHOOK: Input: statsdb1@testpart0

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/alter_table_update_status.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status.q.out b/ql/src/test/results/clientpositive/alter_table_update_status.q.out
index 899ebbd..c6140be 100644
--- a/ql/src/test/results/clientpositive/alter_table_update_status.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_update_status.q.out
@@ -35,10 +35,12 @@ POSTHOOK: Output: default@src_stat_int
 PREHOOK: query: ANALYZE TABLE src_stat COMPUTE STATISTICS for columns key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat
+PREHOOK: Output: default@src_stat
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat COMPUTE STATISTICS for columns key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat
+POSTHOOK: Output: default@src_stat
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat key
 PREHOOK: type: DESCTABLE
@@ -108,10 +110,12 @@ COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true
 PREHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_int
+PREHOOK: Output: default@src_stat_int
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_int
+POSTHOOK: Output: default@src_stat_int
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_int key
 PREHOOK: type: DESCTABLE
@@ -131,7 +135,7 @@ num_trues
 num_falses          	                    	 	 	 	 	 	 	 	 	 	 
 bitVector           	HL                  	 	 	 	 	 	 	 	 	 	 
 comment             	from deserializer   	 	 	 	 	 	 	 	 	 	 
-COLUMN_STATS_ACCURATE	{\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
+COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
 PREHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
 PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
 POSTHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
@@ -154,7 +158,7 @@ num_trues
 num_falses          	                    	 	 	 	 	 	 	 	 	 	 
 bitVector           	HL                  	 	 	 	 	 	 	 	 	 	 
 comment             	from deserializer   	 	 	 	 	 	 	 	 	 	 
-COLUMN_STATS_ACCURATE	{\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
+COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
 PREHOOK: query: create database if not exists dummydb
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:dummydb

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out b/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
index 8e4ca0a..5ff136d 100644
--- a/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
+++ b/ql/src/test/results/clientpositive/alter_table_update_status_disable_bitvector.q.out
@@ -35,10 +35,12 @@ POSTHOOK: Output: default@src_stat_int
 PREHOOK: query: ANALYZE TABLE src_stat COMPUTE STATISTICS for columns key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat
+PREHOOK: Output: default@src_stat
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat COMPUTE STATISTICS for columns key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat
+POSTHOOK: Output: default@src_stat
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat key
 PREHOOK: type: DESCTABLE
@@ -108,10 +110,12 @@ COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true
 PREHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_int
+PREHOOK: Output: default@src_stat_int
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_int COMPUTE STATISTICS for columns key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_int
+POSTHOOK: Output: default@src_stat_int
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_int key
 PREHOOK: type: DESCTABLE
@@ -131,7 +135,7 @@ num_trues
 num_falses          	                    	 	 	 	 	 	 	 	 	 	 
 bitVector           	                    	 	 	 	 	 	 	 	 	 	 
 comment             	from deserializer   	 	 	 	 	 	 	 	 	 	 
-COLUMN_STATS_ACCURATE	{\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
+COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
 PREHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
 PREHOOK: type: ALTERTABLE_UPDATETABLESTATS
 POSTHOOK: query: ALTER TABLE src_stat_int UPDATE STATISTICS for column key SET ('numDVs'='2222','lowValue'='333.22','highValue'='22.22')
@@ -154,7 +158,7 @@ num_trues
 num_falses          	                    	 	 	 	 	 	 	 	 	 	 
 bitVector           	                    	 	 	 	 	 	 	 	 	 	 
 comment             	from deserializer   	 	 	 	 	 	 	 	 	 	 
-COLUMN_STATS_ACCURATE	{\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
+COLUMN_STATS_ACCURATE	{\"BASIC_STATS\":\"true\",\"COLUMN_STATS\":{\"key\":\"true\"}}	 	 	 	 	 	 	 	 	 	 
 PREHOOK: query: create database if not exists dummydb
 PREHOOK: type: CREATEDATABASE
 PREHOOK: Output: database:dummydb

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
index 6b2b85b..e70c6b8 100644
--- a/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
+++ b/ql/src/test/results/clientpositive/analyze_tbl_date.q.out
@@ -16,10 +16,12 @@ POSTHOOK: Lineage: test_table.d EXPRESSION [(values__tmp__table__1)values__tmp__
 PREHOOK: query: analyze table test_table compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@test_table
+PREHOOK: Output: default@test_table
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table test_table compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@test_table
+POSTHOOK: Output: default@test_table
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted test_table
 PREHOOK: type: DESCTABLE

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/analyze_tbl_part.q.out b/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
index 0f38045..5899ab2 100644
--- a/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
+++ b/ql/src/test/results/clientpositive/analyze_tbl_part.q.out
@@ -35,12 +35,18 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_part
 PREHOOK: Input: default@src_stat_part@partitionid=1
 PREHOOK: Input: default@src_stat_part@partitionid=2
+PREHOOK: Output: default@src_stat_part
+PREHOOK: Output: default@src_stat_part@partitionid=1
+PREHOOK: Output: default@src_stat_part@partitionid=2
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_part partition (partitionId) COMPUTE STATISTICS for columns key
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_part
 POSTHOOK: Input: default@src_stat_part@partitionid=1
 POSTHOOK: Input: default@src_stat_part@partitionid=2
+POSTHOOK: Output: default@src_stat_part
+POSTHOOK: Output: default@src_stat_part@partitionid=1
+POSTHOOK: Output: default@src_stat_part@partitionid=2
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1) key
 PREHOOK: type: DESCTABLE
@@ -65,12 +71,18 @@ PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_part
 PREHOOK: Input: default@src_stat_part@partitionid=1
 PREHOOK: Input: default@src_stat_part@partitionid=2
+PREHOOK: Output: default@src_stat_part
+PREHOOK: Output: default@src_stat_part@partitionid=1
+PREHOOK: Output: default@src_stat_part@partitionid=2
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_part partition (partitionId) COMPUTE STATISTICS for columns key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_part
 POSTHOOK: Input: default@src_stat_part@partitionid=1
 POSTHOOK: Input: default@src_stat_part@partitionid=2
+POSTHOOK: Output: default@src_stat_part
+POSTHOOK: Output: default@src_stat_part@partitionid=1
+POSTHOOK: Output: default@src_stat_part@partitionid=2
 #### A masked pattern was here ####
 PREHOOK: query: describe formatted src_stat_part PARTITION(partitionId=1) key
 PREHOOK: type: DESCTABLE
@@ -144,19 +156,27 @@ PREHOOK: query: ANALYZE TABLE src_stat_string_part partition (partitionName="p\'
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_string_part
 PREHOOK: Input: default@src_stat_string_part@partitionname=p%271
+PREHOOK: Output: default@src_stat_string_part
+PREHOOK: Output: default@src_stat_string_part@partitionname=p%271
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_string_part partition (partitionName="p\'1") COMPUTE STATISTICS for columns key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_string_part
 POSTHOOK: Input: default@src_stat_string_part@partitionname=p%271
+POSTHOOK: Output: default@src_stat_string_part
+POSTHOOK: Output: default@src_stat_string_part@partitionname=p%271
 #### A masked pattern was here ####
 PREHOOK: query: ANALYZE TABLE src_stat_string_part partition (partitionName="p\"1") COMPUTE STATISTICS for columns key, value
 PREHOOK: type: QUERY
 PREHOOK: Input: default@src_stat_string_part
 PREHOOK: Input: default@src_stat_string_part@partitionname=p%221
+PREHOOK: Output: default@src_stat_string_part
+PREHOOK: Output: default@src_stat_string_part@partitionname=p%221
 #### A masked pattern was here ####
 POSTHOOK: query: ANALYZE TABLE src_stat_string_part partition (partitionName="p\"1") COMPUTE STATISTICS for columns key, value
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@src_stat_string_part
 POSTHOOK: Input: default@src_stat_string_part@partitionname=p%221
+POSTHOOK: Output: default@src_stat_string_part
+POSTHOOK: Output: default@src_stat_string_part@partitionname=p%221
 #### A masked pattern was here ####

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
index da59211..ab8c22b 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_deep_filters.q.out
@@ -59,10 +59,12 @@ POSTHOOK: Output: default@over1k
 PREHOOK: query: analyze table over1k compute statistics for columns
 PREHOOK: type: QUERY
 PREHOOK: Input: default@over1k
+PREHOOK: Output: default@over1k
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table over1k compute statistics for columns
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@over1k
+POSTHOOK: Output: default@over1k
 #### A masked pattern was here ####
 PREHOOK: query: explain select count(*) from over1k where (
 (t=1 and si=2)

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_filter.q.out b/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
index defb088..20f870e 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_filter.q.out
@@ -112,10 +112,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
+PREHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
+POSTHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from loc_orc where state='OH'
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
index cd4b0ad..4e67841 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby.q.out
@@ -76,10 +76,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table loc_orc compute statistics for columns state
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
+PREHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
+POSTHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select a, c, min(b)
 from ( select state as a, locid as b, count(*) as c
@@ -177,10 +179,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table loc_orc compute statistics for columns state,locid,year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
+PREHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state,locid,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
+POSTHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select year from loc_orc group by year
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
index 4986879..ffcb20f 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_groupby2.q.out
@@ -29,10 +29,12 @@ POSTHOOK: Output: default@location
 PREHOOK: query: analyze table location compute statistics for columns state, country
 PREHOOK: type: QUERY
 PREHOOK: Input: default@location
+PREHOOK: Output: default@location
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table location compute statistics for columns state, country
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@location
+POSTHOOK: Output: default@location
 #### A masked pattern was here ####
 PREHOOK: query: explain select state, country from location group by state, country
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_join.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_join.q.out b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
index a7e73a0..9173e7a 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_join.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_join.q.out
@@ -97,26 +97,32 @@ POSTHOOK: Output: default@loc
 PREHOOK: query: analyze table emp compute statistics for columns lastname,deptid,locid
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp
+PREHOOK: Output: default@emp
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table emp compute statistics for columns lastname,deptid,locid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emp
+POSTHOOK: Output: default@emp
 #### A masked pattern was here ####
 PREHOOK: query: analyze table dept compute statistics for columns deptname,deptid
 PREHOOK: type: QUERY
 PREHOOK: Input: default@dept
+PREHOOK: Output: default@dept
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table dept compute statistics for columns deptname,deptid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@dept
+POSTHOOK: Output: default@dept
 #### A masked pattern was here ####
 PREHOOK: query: analyze table loc compute statistics for columns state,locid,zip,year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc
+PREHOOK: Output: default@loc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc compute statistics for columns state,locid,zip,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc
+POSTHOOK: Output: default@loc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp e join dept d on (e.deptid = d.deptid)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
index a73e34d..bec98d0 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_join_pkfk.q.out
@@ -297,10 +297,12 @@ POSTHOOK: Output: default@store
 PREHOOK: query: analyze table store compute statistics for columns s_store_sk, s_floor_space
 PREHOOK: type: QUERY
 PREHOOK: Input: default@store
+PREHOOK: Output: default@store
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table store compute statistics for columns s_store_sk, s_floor_space
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store
+POSTHOOK: Output: default@store
 #### A masked pattern was here ####
 PREHOOK: query: analyze table store_bigint compute statistics
 PREHOOK: type: QUERY
@@ -313,10 +315,12 @@ POSTHOOK: Output: default@store_bigint
 PREHOOK: query: analyze table store_bigint compute statistics for columns s_store_sk, s_floor_space
 PREHOOK: type: QUERY
 PREHOOK: Input: default@store_bigint
+PREHOOK: Output: default@store_bigint
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table store_bigint compute statistics for columns s_store_sk, s_floor_space
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store_bigint
+POSTHOOK: Output: default@store_bigint
 #### A masked pattern was here ####
 PREHOOK: query: analyze table store_sales compute statistics
 PREHOOK: type: QUERY
@@ -329,10 +333,12 @@ POSTHOOK: Output: default@store_sales
 PREHOOK: query: analyze table store_sales compute statistics for columns ss_store_sk, ss_addr_sk, ss_quantity
 PREHOOK: type: QUERY
 PREHOOK: Input: default@store_sales
+PREHOOK: Output: default@store_sales
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table store_sales compute statistics for columns ss_store_sk, ss_addr_sk, ss_quantity
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@store_sales
+POSTHOOK: Output: default@store_sales
 #### A masked pattern was here ####
 PREHOOK: query: analyze table customer_address compute statistics
 PREHOOK: type: QUERY
@@ -345,10 +351,12 @@ POSTHOOK: Output: default@customer_address
 PREHOOK: query: analyze table customer_address compute statistics for columns ca_address_sk
 PREHOOK: type: QUERY
 PREHOOK: Input: default@customer_address
+PREHOOK: Output: default@customer_address
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table customer_address compute statistics for columns ca_address_sk
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@customer_address
+POSTHOOK: Output: default@customer_address
 #### A masked pattern was here ####
 PREHOOK: query: explain select s.s_store_sk from store s join store_sales ss on (s.s_store_sk = ss.ss_store_sk)
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
index ea181cb..5139db4 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_limit.q.out
@@ -55,10 +55,12 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name
 PREHOOK: query: analyze table loc_orc compute statistics for columns state, locid, zip, year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
+PREHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state, locid, zip, year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
+POSTHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from loc_orc
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_part.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_part.q.out b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
index def4d4f..3a94a6a 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_part.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_part.q.out
@@ -273,11 +273,15 @@ PREHOOK: query: analyze table loc_orc partition(year='2001') compute statistics
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
 PREHOOK: Input: default@loc_orc@year=2001
+PREHOOK: Output: default@loc_orc
+PREHOOK: Output: default@loc_orc@year=2001
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc partition(year='2001') compute statistics for columns state,locid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
 POSTHOOK: Input: default@loc_orc@year=2001
+POSTHOOK: Output: default@loc_orc
+POSTHOOK: Output: default@loc_orc@year=2001
 #### A masked pattern was here ####
 PREHOOK: query: explain select zip from loc_orc
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_select.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_select.q.out b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
index e10ce1a..9aaa6f6 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_select.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_select.q.out
@@ -113,10 +113,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table alltypes_orc compute statistics for columns bo1, ti1, si1, i1, bi1, f1, d1, s1, vc1
 PREHOOK: type: QUERY
 PREHOOK: Input: default@alltypes_orc
+PREHOOK: Output: default@alltypes_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table alltypes_orc compute statistics for columns bo1, ti1, si1, i1, bi1, f1, d1, s1, vc1
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@alltypes_orc
+POSTHOOK: Output: default@alltypes_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from alltypes_orc
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_table.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_table.q.out b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
index ff7b403..f61e8d8 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_table.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_table.q.out
@@ -120,10 +120,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table emp_orc compute statistics for columns deptid
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp_orc
+PREHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table emp_orc compute statistics for columns deptid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emp_orc
+POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY
@@ -170,10 +172,12 @@ STAGE PLANS:
 PREHOOK: query: analyze table emp_orc compute statistics for columns lastname,deptid
 PREHOOK: type: QUERY
 PREHOOK: Input: default@emp_orc
+PREHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table emp_orc compute statistics for columns lastname,deptid
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@emp_orc
+POSTHOOK: Output: default@emp_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select * from emp_orc
 PREHOOK: type: QUERY

http://git-wip-us.apache.org/repos/asf/hive/blob/ec9cc0bc/ql/src/test/results/clientpositive/annotate_stats_union.q.out
----------------------------------------------------------------------
diff --git a/ql/src/test/results/clientpositive/annotate_stats_union.q.out b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
index 059f261..3b4b169 100644
--- a/ql/src/test/results/clientpositive/annotate_stats_union.q.out
+++ b/ql/src/test/results/clientpositive/annotate_stats_union.q.out
@@ -55,10 +55,12 @@ POSTHOOK: Lineage: loc_orc.zip SIMPLE [(loc_staging)loc_staging.FieldSchema(name
 PREHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 PREHOOK: type: QUERY
 PREHOOK: Input: default@loc_orc
+PREHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@loc_orc
+POSTHOOK: Output: default@loc_orc
 #### A masked pattern was here ####
 PREHOOK: query: explain select state from loc_orc
 PREHOOK: type: QUERY
@@ -282,18 +284,22 @@ PREHOOK: query: analyze table loc_staging compute statistics for columns state,l
 PREHOOK: type: QUERY
 PREHOOK: Input: test@loc_staging
 #### A masked pattern was here ####
+PREHOOK: Output: test@loc_staging
 POSTHOOK: query: analyze table loc_staging compute statistics for columns state,locid,zip,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: test@loc_staging
 #### A masked pattern was here ####
+POSTHOOK: Output: test@loc_staging
 PREHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 PREHOOK: type: QUERY
 PREHOOK: Input: test@loc_orc
 #### A masked pattern was here ####
+PREHOOK: Output: test@loc_orc
 POSTHOOK: query: analyze table loc_orc compute statistics for columns state,locid,zip,year
 POSTHOOK: type: QUERY
 POSTHOOK: Input: test@loc_orc
 #### A masked pattern was here ####
+POSTHOOK: Output: test@loc_orc
 PREHOOK: query: explain select * from (select state from default.loc_orc union all select state from test.loc_orc) temp
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select * from (select state from default.loc_orc union all select state from test.loc_orc) temp