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 2013/11/18 17:42:00 UTC

svn commit: r1543075 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/exec/ test/results/clientpositive/

Author: hashutosh
Date: Mon Nov 18 16:41:59 2013
New Revision: 1543075

URL: http://svn.apache.org/r1543075
Log:
HIVE-5809 : incorrect stats in some cases with hive.stats.autogather=true (Ashutosh Chauhan via Navis)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java
    hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
    hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out
    hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java?rev=1543075&r1=1543074&r2=1543075&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/exec/StatsTask.java Mon Nov 18 16:41:59 2013
@@ -377,7 +377,7 @@ public class StatsTask extends Task<Stat
         if (work.getLoadTableDesc() != null &&
             !work.getLoadTableDesc().getReplace()) {
           String originalValue = parameters.get(statType);
-          if (originalValue != null) {
+          if (originalValue != null && !originalValue.equals("-1")) {
             longValue += Long.parseLong(originalValue);
           }
         }

Modified: hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out?rev=1543075&r1=1543074&r2=1543075&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/dynamic_partition_skip_default.q.out Mon Nov 18 16:41:59 2013
@@ -112,9 +112,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
-              numRows 0
+              numRows 1
               partition_columns partcol1/partcol2
-              rawDataSize 0
+              rawDataSize 1
               serialization.ddl struct dynamic_part_table { i32 intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -213,9 +213,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
-              numRows 0
+              numRows 1
               partition_columns partcol1/partcol2
-              rawDataSize 0
+              rawDataSize 1
               serialization.ddl struct dynamic_part_table { i32 intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -314,9 +314,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
-              numRows 0
+              numRows 1
               partition_columns partcol1/partcol2
-              rawDataSize 0
+              rawDataSize 1
               serialization.ddl struct dynamic_part_table { i32 intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe
@@ -356,9 +356,9 @@ STAGE PLANS:
 #### A masked pattern was here ####
               name default.dynamic_part_table
               numFiles 1
-              numRows 0
+              numRows 1
               partition_columns partcol1/partcol2
-              rawDataSize 0
+              rawDataSize 1
               serialization.ddl struct dynamic_part_table { i32 intcol}
               serialization.format 1
               serialization.lib org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe

Modified: hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out?rev=1543075&r1=1543074&r2=1543075&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/metadata_only_queries.q.out Mon Nov 18 16:41:59 2013
@@ -986,7 +986,7 @@ POSTHOOK: Lineage: stats_tbl_part PARTIT
 POSTHOOK: Lineage: stats_tbl_part PARTITION(dt=2012).si SIMPLE [(over10k)over10k.FieldSchema(name:si, type:smallint, comment:null), ]
 POSTHOOK: Lineage: stats_tbl_part PARTITION(dt=2012).t SIMPLE [(over10k)over10k.FieldSchema(name:t, type:tinyint, comment:null), ]
 POSTHOOK: Lineage: stats_tbl_part PARTITION(dt=2012).ts SIMPLE [(over10k)over10k.FieldSchema(name:ts, type:timestamp, comment:null), ]
-9486	9486	9486	9486	9486	9486	65791	0	99.9800033569336	0.0
+9489	9489	9489	9489	9489	9489	65791	0	99.9800033569336	0.0
 PREHOOK: query: explain select count(ts) from stats_tbl_part
 PREHOOK: type: QUERY
 POSTHOOK: query: explain select count(ts) from stats_tbl_part

Modified: hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out?rev=1543075&r1=1543074&r2=1543075&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/stats_only_null.q.out Mon Nov 18 16:41:59 2013
@@ -377,8 +377,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	1                   
-	numRows             	5                   
-	rawDataSize         	70                  
+	numRows             	6                   
+	rawDataSize         	71                  
 	totalSize           	77                  
 #### A masked pattern was here ####
 	 	 
@@ -430,8 +430,8 @@ Protect Mode:       	None               
 Partition Parameters:	 	 
 	COLUMN_STATS_ACCURATE	true                
 	numFiles            	1                   
-	numRows             	3                   
-	rawDataSize         	48                  
+	numRows             	4                   
+	rawDataSize         	49                  
 	totalSize           	53                  
 #### A masked pattern was here ####
 	 	 
@@ -542,7 +542,7 @@ POSTHOOK: Lineage: stats_null_part PARTI
 POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).b SIMPLE [(temps_null)temps_null.FieldSchema(name:b, type:int, comment:null), ]
 POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).c SIMPLE [(temps_null)temps_null.FieldSchema(name:c, type:string, comment:null), ]
 POSTHOOK: Lineage: stats_null_part PARTITION(dt=2011).d SIMPLE [(temps_null)temps_null.FieldSchema(name:d, type:smallint, comment:null), ]
-8	6	6	8	8
+10	8	8	10	10
 PREHOOK: query: drop table stats_null
 PREHOOK: type: DROPTABLE
 PREHOOK: Input: default@stats_null