You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hive.apache.org by rh...@apache.org on 2014/08/17 18:56:54 UTC

svn commit: r1618481 - in /hive/trunk/ql/src: java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java test/queries/clientpositive/windowing.q test/results/clientpositive/windowing.q.out

Author: rhbutani
Date: Sun Aug 17 16:56:53 2014
New Revision: 1618481

URL: http://svn.apache.org/r1618481
Log:
HIVE-7744 In Windowing Streaming mode Avg and Sum give incorrect results when Wdw size is same as partition size (Harish Butani via Ashutosh Chauhan)

Modified:
    hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java
    hive/trunk/ql/src/test/queries/clientpositive/windowing.q
    hive/trunk/ql/src/test/results/clientpositive/windowing.q.out

Modified: hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java?rev=1618481&r1=1618480&r2=1618481&view=diff
==============================================================================
--- hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java (original)
+++ hive/trunk/ql/src/java/org/apache/hadoop/hive/ql/udf/generic/GenericUDAFStreamingEvaluator.java Sun Aug 17 16:56:53 2014
@@ -179,6 +179,7 @@ public abstract class GenericUDAFStreami
 
       for (int i = 0; i < ss.numFollowing; i++) {
         ss.results.add(getNextResult(ss));
+        ss.numRows++;
       }
       return o;
     }

Modified: hive/trunk/ql/src/test/queries/clientpositive/windowing.q
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/queries/clientpositive/windowing.q?rev=1618481&r1=1618480&r2=1618481&view=diff
==============================================================================
--- hive/trunk/ql/src/test/queries/clientpositive/windowing.q (original)
+++ hive/trunk/ql/src/test/queries/clientpositive/windowing.q Sun Aug 17 16:56:53 2014
@@ -438,3 +438,9 @@ select p_mfgr, 
 from part 
 where p_mfgr = 'Manufacturer#6'
 ;
+
+-- 46. window sz is same as partition sz
+select p_retailprice, avg(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following), 
+sum(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following) 
+from part 
+where p_mfgr='Manufacturer#1';

Modified: hive/trunk/ql/src/test/results/clientpositive/windowing.q.out
URL: http://svn.apache.org/viewvc/hive/trunk/ql/src/test/results/clientpositive/windowing.q.out?rev=1618481&r1=1618480&r2=1618481&view=diff
==============================================================================
--- hive/trunk/ql/src/test/results/clientpositive/windowing.q.out (original)
+++ hive/trunk/ql/src/test/results/clientpositive/windowing.q.out Sun Aug 17 16:56:53 2014
@@ -2334,3 +2334,25 @@ where p_mfgr = 'Manufacturer#6'
 POSTHOOK: type: QUERY
 POSTHOOK: Input: default@part
 #### A masked pattern was here ####
+PREHOOK: query: -- 46. window sz is same as partition sz
+select p_retailprice, avg(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following), 
+sum(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following) 
+from part 
+where p_mfgr='Manufacturer#1'
+PREHOOK: type: QUERY
+PREHOOK: Input: default@part
+#### A masked pattern was here ####
+POSTHOOK: query: -- 46. window sz is same as partition sz
+select p_retailprice, avg(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following), 
+sum(p_retailprice) over (partition by p_mfgr order by p_name rows between current row and 6 following) 
+from part 
+where p_mfgr='Manufacturer#1'
+POSTHOOK: type: QUERY
+POSTHOOK: Input: default@part
+#### A masked pattern was here ####
+1173.15	1458.2883333333336	8749.730000000001
+1173.15	1515.3160000000003	7576.580000000002
+1753.76	1600.8575000000003	6403.430000000001
+1602.59	1549.8900000000003	4649.670000000001
+1414.42	1523.5400000000004	3047.080000000001
+1632.66	1632.6600000000008	1632.6600000000008