Index: CHANGES.txt
===================================================================
--- CHANGES.txt (revision 740935)
+++ CHANGES.txt (working copy)
@@ -288,3 +288,5 @@
right outer join gave spurious rows in join. (Namit Jain via athusoo)
HIVE-189. Make sampling tests deterministic by sorting output. (athusoo)
+
+ HIVE-273. Fix avg UDAF which got broken hive 65. (athusoo)
Index: ql/src/test/results/clientpositive/groupby3_map.q.out
===================================================================
--- ql/src/test/results/clientpositive/groupby3_map.q.out (revision 740935)
+++ ql/src/test/results/clientpositive/groupby3_map.q.out (working copy)
@@ -53,7 +53,7 @@
expr: max(VALUE.1)
expr: avg(DISTINCT UDFToDouble(KEY.0))
expr: min(VALUE.3)
- expr: avg(UDFToDouble(VALUE.4))
+ expr: avg(VALUE.4)
mode: partial2
File Output Operator
compressed: false
@@ -65,7 +65,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- /data/users/athusoo/commits/hive_trunk_ws3/build/ql/tmp/1389629365/204290894.10001
+ /data/users/athusoo/commits/hive_trunk_ws2/build/ql/tmp/153620472/510260835.10001
Reduce Output Operator
sort order:
tag: -1
@@ -85,9 +85,9 @@
aggregations:
expr: sum(VALUE.0)
expr: max(VALUE.1)
- expr: avg(UDFToDouble(VALUE.2))
+ expr: avg(VALUE.2)
expr: min(VALUE.3)
- expr: avg(UDFToDouble(VALUE.4))
+ expr: avg(VALUE.4)
mode: final
Select Operator
expressions:
@@ -132,4 +132,4 @@
name: dest1
-130091.0 NULL NULL 98.0 98.0
+130091.0 260.182 256.10355987055016 98.0 98.0
Index: ql/src/test/results/clientpositive/udf3.q.out
===================================================================
--- ql/src/test/results/clientpositive/udf3.q.out (revision 740935)
+++ ql/src/test/results/clientpositive/udf3.q.out (working copy)
@@ -40,7 +40,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- /data/users/athusoo/apacheprojects/hive_local_ws3/build/ql/tmp/68854306/763012378.10001
+ /data/users/athusoo/commits/hive_trunk_ws2/build/ql/tmp/461551864/1010092958.10001
Reduce Output Operator
sort order:
tag: -1
@@ -59,7 +59,7 @@
Group By Operator
aggregations:
expr: max(VALUE.0)
- expr: avg(UDFToDouble(VALUE.1))
+ expr: avg(VALUE.1)
expr: count(VALUE.2)
expr: sum(VALUE.3)
expr: min(VALUE.4)
Index: ql/src/test/results/clientpositive/udf7.q.out
===================================================================
--- ql/src/test/results/clientpositive/udf7.q.out (revision 0)
+++ ql/src/test/results/clientpositive/udf7.q.out (revision 0)
@@ -0,0 +1,77 @@
+ABSTRACT SYNTAX TREE:
+ (TOK_QUERY (TOK_FROM (TOK_TABREF dest1)) (TOK_INSERT (TOK_DESTINATION (TOK_DIR TOK_TMP_FILE)) (TOK_SELECT (TOK_SELEXPR (TOK_FUNCTION avg (TOK_COLREF c1))) (TOK_SELEXPR (TOK_FUNCTION sum (TOK_COLREF c1))) (TOK_SELEXPR (TOK_FUNCTION count (TOK_COLREF c1))))))
+
+STAGE DEPENDENCIES:
+ Stage-1 is a root stage
+ Stage-2 depends on stages: Stage-1
+ Stage-0 is a root stage
+
+STAGE PLANS:
+ Stage: Stage-1
+ Map Reduce
+ Alias -> Map Operator Tree:
+ dest1
+ Reduce Output Operator
+ sort order:
+ Map-reduce partition columns:
+ expr: rand()
+ type: double
+ tag: -1
+ value expressions:
+ expr: c1
+ type: string
+ Reduce Operator Tree:
+ Group By Operator
+ aggregations:
+ expr: sum(UDFToDouble(VALUE.0))
+ expr: count(VALUE.0)
+ expr: avg(UDFToDouble(VALUE.0))
+ mode: partial1
+ File Output Operator
+ compressed: false
+ table:
+ input format: org.apache.hadoop.mapred.SequenceFileInputFormat
+ output format: org.apache.hadoop.mapred.SequenceFileOutputFormat
+ name: binary_table
+
+ Stage: Stage-2
+ Map Reduce
+ Alias -> Map Operator Tree:
+ /data/users/athusoo/commits/hive_trunk_ws2/build/ql/tmp/181599227/280831237.10002
+ Reduce Output Operator
+ sort order:
+ tag: -1
+ value expressions:
+ expr: 0
+ type: double
+ expr: 1
+ type: bigint
+ expr: 2
+ type: string
+ Reduce Operator Tree:
+ Group By Operator
+ aggregations:
+ expr: sum(VALUE.0)
+ expr: count(VALUE.1)
+ expr: avg(VALUE.2)
+ mode: final
+ Select Operator
+ expressions:
+ expr: 2
+ type: double
+ expr: 0
+ type: double
+ expr: 1
+ type: bigint
+ File Output Operator
+ compressed: false
+ table:
+ input format: org.apache.hadoop.mapred.TextInputFormat
+ output format: org.apache.hadoop.hive.ql.io.IgnoreKeyTextOutputFormat
+
+ Stage: Stage-0
+ Fetch Operator
+ limit: -1
+
+
+1.0 1.0 1
Index: ql/src/test/results/clientpositive/groupby3.q.out
===================================================================
--- ql/src/test/results/clientpositive/groupby3.q.out (revision 740935)
+++ ql/src/test/results/clientpositive/groupby3.q.out (working copy)
@@ -43,7 +43,7 @@
Stage: Stage-2
Map Reduce
Alias -> Map Operator Tree:
- /data/users/athusoo/commits/hive_trunk_ws3/build/ql/tmp/1302296/900109453.10001
+ /data/users/athusoo/commits/hive_trunk_ws2/build/ql/tmp/315128328/717538.10001
Reduce Output Operator
sort order:
tag: -1
@@ -63,9 +63,9 @@
aggregations:
expr: sum(VALUE.0)
expr: max(VALUE.1)
- expr: avg(UDFToDouble(VALUE.2))
+ expr: avg(VALUE.2)
expr: min(VALUE.3)
- expr: avg(UDFToDouble(VALUE.4))
+ expr: avg(VALUE.4)
mode: final
Select Operator
expressions:
@@ -110,4 +110,4 @@
name: dest1
-130091.0 NULL NULL 98.0 98.0
+130091.0 260.182 256.10355987055016 98.0 98.0
Index: ql/src/test/results/compiler/plan/groupby1.q.xml
===================================================================
--- ql/src/test/results/compiler/plan/groupby1.q.xml (revision 740935)
+++ ql/src/test/results/compiler/plan/groupby1.q.xml (working copy)
@@ -35,7 +35,7 @@
true
- /data/users/zshao/sync/apache-trunk-HIVE-105/ql/../build/ql/tmp/361270251/169850988.10000.insclause-0
+ /data/users/athusoo/commits/hive_trunk_ws2/ql/../build/ql/tmp/568109016/211707412.10000.insclause-0
location
- file:/data/users/zshao/sync/apache-trunk-HIVE-105/build/ql/test/data/warehouse/dest1
+ file:/data/users/athusoo/commits/hive_trunk_ws2/build/ql/test/data/warehouse/dest1
@@ -118,7 +118,7 @@