luciano/pg_ivm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix check for aggregate functions to work with PostgreSQL 13

Browse source 
In PostgreSQL 14 or later, OIDs of aggregate functions are
described in fmrgoids.h, but that in PostgreSQL 13 doesn't
contain aggregate function OIDs. Therefore, we get the OID
by passing the function name and arg type to to_regprocedure().
This commit is contained in:
Yugo Nagata 2022-06-21 23:08:54 +09:00
parent d99aeb848e
commit 53c9509163
2 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
createas.c
View file

@ -387,7 +387,11 @@ makeIvmAggColumn(ParseState *pstate, Aggref *aggref, char *resname, AttrNumber *
*/
if (strcmp(aggname, "count") != 0)
{
#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 140000)
fn = makeFuncCall(list_make1(makeString("count")), NIL, COERCE_EXPLICIT_CALL, -1);
#else
fn = makeFuncCall(list_make1(makeString("count")), NIL, -1);
#endif
/* Make a Func with a dummy arg, and then override this by the original agg's args. */
node = ParseFuncOrColumn(pstate, fn->funcname, list_make1(dmy_arg), NULL, fn, false, -1);
@ -419,7 +423,11 @@ makeIvmAggColumn(ParseState *pstate, Aggref *aggref, char *resname, AttrNumber *
dmy_args = lappend(dmy_args, con);
ReleaseSysCache(type);
}
#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 140000)
fn = makeFuncCall(list_make1(makeString("sum")), NIL, COERCE_EXPLICIT_CALL, -1);
#else
fn = makeFuncCall(list_make1(makeString("sum")), NIL, -1);
#endif
/* Make a Func with dummy args, and then override this by the original agg's args. */
node = ParseFuncOrColumn(pstate, fn->funcname, dmy_args, NULL, fn, false, -1);
@ -847,6 +855,7 @@ check_ivm_restriction_walker(Node *node, check_ivm_restriction_context *context)
static bool
check_aggregate_supports_ivm(Oid aggfnoid)
{
#if defined(PG_VERSION_NUM) && (PG_VERSION_NUM >= 140000)
switch (aggfnoid)
{
/* count */
@ -877,6 +886,47 @@ check_aggregate_supports_ivm(Oid aggfnoid)
default:
return false;
}
#else
char *funcs[] = {
/* count */
"count(\"any\")",
"count()",
/* sum */
"sum(int8)",
"sum(int4)",
"sum(int2)",
"sum(float4)",
"sum(float8)",
"sum(money)",
"sum(interval)",
"sum(numeric)",
/* avg */
"avg(int8)",
"avg(int4)",
"avg(int2)",
"avg(numeric)",
"avg(float4)",
"avg(float8)",
"avg(interval)",
NULL
};
char **fname = funcs;
while (*fname != NULL)
{
if (DatumGetObjectId(DirectFunctionCall1(to_regprocedure, CStringGetTextDatum(*fname))) == aggfnoid)
return true;
fname++;
}
return false;
#endif
}
/*

4
pg_ivm.h
View file

@ -50,8 +50,4 @@ extern Datum IVM_immediate_maintenance(PG_FUNCTION_ARGS);
extern void AtAbort_IVM(void);
extern bool isIvmName(const char *s);
extern Datum pg_get_viewdef(PG_FUNCTION_ARGS);
#endif