summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPavan Deolasee2015-06-09 06:16:55 +0000
committerPavan Deolasee2015-06-09 06:16:55 +0000
commite98af6507f1a4c37b82f6e8f77bddee6ce395685 (patch)
treeb26a5c86e6257a4112c97886c8720ac8193ea207
parent2a125cb8dee15c358c975d77186de5c1e6464546 (diff)
Use polymorphic inverse function for int8 aggregates.
We got it wrong during the merge process. Also enable window test case now that the issue is resolved.
-rw-r--r--src/include/catalog/pg_aggregate.h4
-rw-r--r--src/test/regress/serial_schedule2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/include/catalog/pg_aggregate.h b/src/include/catalog/pg_aggregate.h
index e7e250d6f8..94e0747d38 100644
--- a/src/include/catalog/pg_aggregate.h
+++ b/src/include/catalog/pg_aggregate.h
@@ -151,7 +151,7 @@ typedef FormData_pg_aggregate *Form_pg_aggregate;
*/
/* avg */
-DATA(insert ( 2100 n 0 int8_avg_accum numeric_collect numeric_poly_avg int8_avg_accum int8_accum_inv numeric_poly_avg f f 0 7018 7018 128 7018 128 _null_ _null_ _null_ ));
+DATA(insert ( 2100 n 0 int8_avg_accum numeric_collect numeric_poly_avg int8_avg_accum int8_avg_accum_inv numeric_poly_avg f f 0 7018 7018 128 7018 128 _null_ _null_ _null_ ));
DATA(insert ( 2101 n 0 int4_avg_accum int8_avg_collect int8_avg int4_avg_accum int4_avg_accum_inv int8_avg f f 0 1016 1016 0 1016 0 "{0,0}" "{0,0}" "{0,0}" ));
DATA(insert ( 2102 n 0 int2_avg_accum int8_avg_collect int8_avg int2_avg_accum int2_avg_accum_inv int8_avg f f 0 1016 1016 0 1016 0 "{0,0}" "{0,0}" "{0,0}" ));
DATA(insert ( 2103 n 0 numeric_avg_accum numeric_collect numeric_avg numeric_avg_accum numeric_accum_inv numeric_avg f f 0 7018 7018 128 7018 128 _null_ _null_ _null_ ));
@@ -160,7 +160,7 @@ DATA(insert ( 2105 n 0 float8_accum float8_collect float8_avg - - - f
DATA(insert ( 2106 n 0 interval_accum interval_collect interval_avg interval_accum interval_accum_inv interval_avg f f 0 1187 1187 0 1187 0 "{0 second,0 second}" "{0 second,0 second}" "{0 second,0 second}" ));
/* sum */
-DATA(insert ( 2107 n 0 int8_avg_accum numeric_collect numeric_poly_sum int8_avg_accum int8_accum_inv numeric_poly_sum f f 0 7018 7018 128 7018 128 _null_ _null_ _null_ ));
+DATA(insert ( 2107 n 0 int8_avg_accum numeric_collect numeric_poly_sum int8_avg_accum int8_avg_accum_inv numeric_poly_sum f f 0 7018 7018 128 7018 128 _null_ _null_ _null_ ));
DATA(insert ( 2108 n 0 int4_sum int8_sum_to_int8 - int4_avg_accum int4_avg_accum_inv int2int4_sum f f 0 20 20 0 1016 0 _null_ _null_ "{0,0}" ));
DATA(insert ( 2109 n 0 int2_sum int8_sum_to_int8 - int2_avg_accum int2_avg_accum_inv int2int4_sum f f 0 20 20 0 1016 0 _null_ _null_ "{0,0}" ));
DATA(insert ( 2110 n 0 float4pl float4pl - - - - f f 0 700 700 0 0 0 _null_ _null_ _null_ ));
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index d15e6801c7..bcddee96cf 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -129,7 +129,7 @@ test: combocid
test: tsearch
test: tsdicts
test: foreign_data
-#test: window
+test: window
test: xmlmap
test: functional_deps
test: advisory_lock