From e51b44b9d13e1a8173d2731e1b1ce1b40c8ff0af Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Mon, 19 Sep 2016 12:00:00 -0400 Subject: [PATCH 6/7] Replace LookupFuncNameTypeNames() with LookupFuncWithArgs() The old function took function name and function argument list as separate arguments. Now that all function signatures are passed around as a FuncWithArgs struct, this is no longer necessary and can be replaced by a function that takes FuncWithArgs directly. --- src/backend/catalog/aclchk.c | 3 +-- src/backend/catalog/objectaddress.c | 6 ++---- src/backend/commands/functioncmds.c | 12 ++++-------- src/backend/commands/opclasscmds.c | 28 +++++++++++++--------------- src/backend/nodes/copyfuncs.c | 1 - src/backend/nodes/equalfuncs.c | 1 - src/backend/parser/gram.y | 22 ++++++++++++---------- src/backend/parser/parse_func.c | 32 ++++++++++++++++---------------- src/include/nodes/parsenodes.h | 4 +--- src/include/parser/parse_func.h | 4 ++-- 10 files changed, 51 insertions(+), 62 deletions(-) diff --git a/src/backend/catalog/aclchk.c b/src/backend/catalog/aclchk.c index c0df671..16449cf 100644 --- a/src/backend/catalog/aclchk.c +++ b/src/backend/catalog/aclchk.c @@ -661,8 +661,7 @@ objectNamesToOids(GrantObjectType objtype, List *objnames) FuncWithArgs *func = (FuncWithArgs *) lfirst(cell); Oid funcid; - funcid = LookupFuncNameTypeNames(func->funcname, - func->funcargs, false); + funcid = LookupFuncWithArgs(func, false); objects = lappend_oid(objects, funcid); } break; diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 905a488..a682460 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -823,8 +823,7 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, { FuncWithArgs *fwa = (FuncWithArgs *) linitial(objname); address.classId = ProcedureRelationId; - address.objectId = - LookupAggNameTypeNames(fwa->funcname, fwa->funcargs, missing_ok); + address.objectId = LookupAggWithArgs(fwa, missing_ok); address.objectSubId = 0; break; } @@ -832,8 +831,7 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, { FuncWithArgs *fwa = (FuncWithArgs *) linitial(objname); address.classId = ProcedureRelationId; - address.objectId = - LookupFuncNameTypeNames(fwa->funcname, fwa->funcargs, missing_ok); + address.objectId = LookupFuncWithArgs(fwa, missing_ok); address.objectSubId = 0; break; } diff --git a/src/backend/commands/functioncmds.c b/src/backend/commands/functioncmds.c index becafc3..94aa348 100644 --- a/src/backend/commands/functioncmds.c +++ b/src/backend/commands/functioncmds.c @@ -1184,9 +1184,7 @@ AlterFunction(ParseState *pstate, AlterFunctionStmt *stmt) rel = heap_open(ProcedureRelationId, RowExclusiveLock); - funcOid = LookupFuncNameTypeNames(stmt->func->funcname, - stmt->func->funcargs, - false); + funcOid = LookupFuncWithArgs(stmt->func, false); tup = SearchSysCacheCopy1(PROCOID, ObjectIdGetDatum(funcOid)); if (!HeapTupleIsValid(tup)) /* should not happen */ @@ -1461,9 +1459,7 @@ CreateCast(CreateCastStmt *stmt) { Form_pg_proc procstruct; - funcid = LookupFuncNameTypeNames(stmt->func->funcname, - stmt->func->funcargs, - false); + funcid = LookupFuncWithArgs(stmt->func, false); tuple = SearchSysCache1(PROCOID, ObjectIdGetDatum(funcid)); if (!HeapTupleIsValid(tuple)) @@ -1843,7 +1839,7 @@ CreateTransform(CreateTransformStmt *stmt) */ if (stmt->fromsql) { - fromsqlfuncid = LookupFuncNameTypeNames(stmt->fromsql->funcname, stmt->fromsql->funcargs, false); + fromsqlfuncid = LookupFuncWithArgs(stmt->fromsql, false); if (!pg_proc_ownercheck(fromsqlfuncid, GetUserId())) aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->fromsql->funcname)); @@ -1868,7 +1864,7 @@ CreateTransform(CreateTransformStmt *stmt) if (stmt->tosql) { - tosqlfuncid = LookupFuncNameTypeNames(stmt->tosql->funcname, stmt->tosql->funcargs, false); + tosqlfuncid = LookupFuncWithArgs(stmt->tosql, false); if (!pg_proc_ownercheck(tosqlfuncid, GetUserId())) aclcheck_error(ACLCHECK_NOT_OWNER, ACL_KIND_PROC, NameListToString(stmt->tosql->funcname)); diff --git a/src/backend/commands/opclasscmds.c b/src/backend/commands/opclasscmds.c index f4dfdb9..db45f79 100644 --- a/src/backend/commands/opclasscmds.c +++ b/src/backend/commands/opclasscmds.c @@ -478,19 +478,19 @@ DefineOpClass(CreateOpClassStmt *stmt) errmsg("invalid operator number %d," " must be between 1 and %d", item->number, maxOpNumber))); - if (item->args != NIL) + if (item->name->funcargs != NIL) { - TypeName *typeName1 = (TypeName *) linitial(item->args); - TypeName *typeName2 = (TypeName *) lsecond(item->args); + TypeName *typeName1 = (TypeName *) linitial(item->name->funcargs); + TypeName *typeName2 = (TypeName *) lsecond(item->name->funcargs); - operOid = LookupOperNameTypeNames(NULL, item->name, + operOid = LookupOperNameTypeNames(NULL, item->name->funcname, typeName1, typeName2, false, -1); } else { /* Default to binary op on input datatype */ - operOid = LookupOperName(NULL, item->name, + operOid = LookupOperName(NULL, item->name->funcname, typeoid, typeoid, false, -1); } @@ -529,8 +529,7 @@ DefineOpClass(CreateOpClassStmt *stmt) errmsg("invalid procedure number %d," " must be between 1 and %d", item->number, maxProcNumber))); - funcOid = LookupFuncNameTypeNames(item->name, item->args, - false); + funcOid = LookupFuncWithArgs(item->name, false); #ifdef NOT_USED /* XXX this is unnecessary given the superuser check above */ /* Caller must own function */ @@ -863,12 +862,12 @@ AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, errmsg("invalid operator number %d," " must be between 1 and %d", item->number, maxOpNumber))); - if (item->args != NIL) + if (item->name->funcargs != NIL) { - TypeName *typeName1 = (TypeName *) linitial(item->args); - TypeName *typeName2 = (TypeName *) lsecond(item->args); + TypeName *typeName1 = (TypeName *) linitial(item->name->funcargs); + TypeName *typeName2 = (TypeName *) lsecond(item->name->funcargs); - operOid = LookupOperNameTypeNames(NULL, item->name, + operOid = LookupOperNameTypeNames(NULL, item->name->funcname, typeName1, typeName2, false, -1); } @@ -914,8 +913,7 @@ AlterOpFamilyAdd(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, errmsg("invalid procedure number %d," " must be between 1 and %d", item->number, maxProcNumber))); - funcOid = LookupFuncNameTypeNames(item->name, item->args, - false); + funcOid = LookupFuncWithArgs(item->name, false); #ifdef NOT_USED /* XXX this is unnecessary given the superuser check above */ /* Caller must own function */ @@ -996,7 +994,7 @@ AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, errmsg("invalid operator number %d," " must be between 1 and %d", item->number, maxOpNumber))); - processTypesSpec(item->args, &lefttype, &righttype); + processTypesSpec(item->class_args, &lefttype, &righttype); /* Save the info */ member = (OpFamilyMember *) palloc0(sizeof(OpFamilyMember)); member->number = item->number; @@ -1011,7 +1009,7 @@ AlterOpFamilyDrop(AlterOpFamilyStmt *stmt, Oid amoid, Oid opfamilyoid, errmsg("invalid procedure number %d," " must be between 1 and %d", item->number, maxProcNumber))); - processTypesSpec(item->args, &lefttype, &righttype); + processTypesSpec(item->class_args, &lefttype, &righttype); /* Save the info */ member = (OpFamilyMember *) palloc0(sizeof(OpFamilyMember)); member->number = item->number; diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c index 71714bc..0da30b1 100644 --- a/src/backend/nodes/copyfuncs.c +++ b/src/backend/nodes/copyfuncs.c @@ -3445,7 +3445,6 @@ _copyCreateOpClassItem(const CreateOpClassItem *from) COPY_SCALAR_FIELD(itemtype); COPY_NODE_FIELD(name); - COPY_NODE_FIELD(args); COPY_SCALAR_FIELD(number); COPY_NODE_FIELD(order_family); COPY_NODE_FIELD(class_args); diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c index 29a090f..ecff265 100644 --- a/src/backend/nodes/equalfuncs.c +++ b/src/backend/nodes/equalfuncs.c @@ -1525,7 +1525,6 @@ _equalCreateOpClassItem(const CreateOpClassItem *a, const CreateOpClassItem *b) { COMPARE_SCALAR_FIELD(itemtype); COMPARE_NODE_FIELD(name); - COMPARE_NODE_FIELD(args); COMPARE_SCALAR_FIELD(number); COMPARE_NODE_FIELD(order_family); COMPARE_NODE_FIELD(class_args); diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y index 215e686..3681208 100644 --- a/src/backend/parser/gram.y +++ b/src/backend/parser/gram.y @@ -5346,9 +5346,11 @@ opclass_item: OPERATOR Iconst any_operator opclass_purpose opt_recheck { CreateOpClassItem *n = makeNode(CreateOpClassItem); + FuncWithArgs *fwa = makeNode(FuncWithArgs); + fwa->funcname = $3; + fwa->funcargs = NIL; n->itemtype = OPCLASS_ITEM_OPERATOR; - n->name = $3; - n->args = NIL; + n->name = fwa; n->number = $2; n->order_family = $4; $$ = (Node *) n; @@ -5357,9 +5359,11 @@ opclass_item: opt_recheck { CreateOpClassItem *n = makeNode(CreateOpClassItem); + FuncWithArgs *fwa = makeNode(FuncWithArgs); + fwa->funcname = $3; + fwa->funcargs = $4; n->itemtype = OPCLASS_ITEM_OPERATOR; - n->name = $3; - n->args = $4; + n->name = fwa; n->number = $2; n->order_family = $5; $$ = (Node *) n; @@ -5368,8 +5372,7 @@ opclass_item: { CreateOpClassItem *n = makeNode(CreateOpClassItem); n->itemtype = OPCLASS_ITEM_FUNCTION; - n->name = $3->funcname; - n->args = $3->funcargs; + n->name = $3; n->number = $2; $$ = (Node *) n; } @@ -5377,8 +5380,7 @@ opclass_item: { CreateOpClassItem *n = makeNode(CreateOpClassItem); n->itemtype = OPCLASS_ITEM_FUNCTION; - n->name = $6->funcname; - n->args = $6->funcargs; + n->name = $6; n->number = $2; n->class_args = $4; $$ = (Node *) n; @@ -5465,7 +5467,7 @@ opclass_drop: CreateOpClassItem *n = makeNode(CreateOpClassItem); n->itemtype = OPCLASS_ITEM_OPERATOR; n->number = $2; - n->args = $4; + n->class_args = $4; $$ = (Node *) n; } | FUNCTION Iconst '(' type_list ')' @@ -5473,7 +5475,7 @@ opclass_drop: CreateOpClassItem *n = makeNode(CreateOpClassItem); n->itemtype = OPCLASS_ITEM_FUNCTION; n->number = $2; - n->args = $4; + n->class_args = $4; $$ = (Node *) n; } ; diff --git a/src/backend/parser/parse_func.c b/src/backend/parser/parse_func.c index 56c9a42..b3938e4 100644 --- a/src/backend/parser/parse_func.c +++ b/src/backend/parser/parse_func.c @@ -1933,19 +1933,19 @@ LookupFuncName(List *funcname, int nargs, const Oid *argtypes, bool noError) } /* - * LookupFuncNameTypeNames + * LookupFuncWithArgs * Like LookupFuncName, but the argument types are specified by a - * list of TypeName nodes. + * FuncWithArgs node. */ Oid -LookupFuncNameTypeNames(List *funcname, List *argtypes, bool noError) +LookupFuncWithArgs(FuncWithArgs *func, bool noError) { Oid argoids[FUNC_MAX_ARGS]; int argcount; int i; ListCell *args_item; - argcount = list_length(argtypes); + argcount = list_length(func->funcargs); if (argcount > FUNC_MAX_ARGS) ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), @@ -1954,7 +1954,7 @@ LookupFuncNameTypeNames(List *funcname, List *argtypes, bool noError) FUNC_MAX_ARGS, FUNC_MAX_ARGS))); - args_item = list_head(argtypes); + args_item = list_head(func->funcargs); for (i = 0; i < argcount; i++) { TypeName *t = (TypeName *) lfirst(args_item); @@ -1963,19 +1963,19 @@ LookupFuncNameTypeNames(List *funcname, List *argtypes, bool noError) args_item = lnext(args_item); } - return LookupFuncName(funcname, argcount, argoids, noError); + return LookupFuncName(func->funcname, argcount, argoids, noError); } /* - * LookupAggNameTypeNames - * Find an aggregate function given a name and list of TypeName nodes. + * LookupAggWithArgs + * Find an aggregate function from a given FuncWithArgs node. * - * This is almost like LookupFuncNameTypeNames, but the error messages refer + * This is almost like LookupFuncWithArgs, but the error messages refer * to aggregates rather than plain functions, and we verify that the found * function really is an aggregate. */ Oid -LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) +LookupAggWithArgs(FuncWithArgs *agg, bool noError) { Oid argoids[FUNC_MAX_ARGS]; int argcount; @@ -1985,7 +1985,7 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) HeapTuple ftup; Form_pg_proc pform; - argcount = list_length(argtypes); + argcount = list_length(agg->funcargs); if (argcount > FUNC_MAX_ARGS) ereport(ERROR, (errcode(ERRCODE_TOO_MANY_ARGUMENTS), @@ -1995,7 +1995,7 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) FUNC_MAX_ARGS))); i = 0; - foreach(lc, argtypes) + foreach(lc, agg->funcargs) { TypeName *t = (TypeName *) lfirst(lc); @@ -2003,7 +2003,7 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) i++; } - oid = LookupFuncName(aggname, argcount, argoids, true); + oid = LookupFuncName(agg->funcname, argcount, argoids, true); if (!OidIsValid(oid)) { @@ -2013,12 +2013,12 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), errmsg("aggregate %s(*) does not exist", - NameListToString(aggname)))); + NameListToString(agg->funcname)))); else ereport(ERROR, (errcode(ERRCODE_UNDEFINED_FUNCTION), errmsg("aggregate %s does not exist", - func_signature_string(aggname, argcount, + func_signature_string(agg->funcname, argcount, NIL, argoids)))); } @@ -2037,7 +2037,7 @@ LookupAggNameTypeNames(List *aggname, List *argtypes, bool noError) ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE), errmsg("function %s is not an aggregate", - func_signature_string(aggname, argcount, + func_signature_string(agg->funcname, argcount, NIL, argoids)))); } diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 6de2cab..564ed50 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -2271,9 +2271,7 @@ typedef struct CreateOpClassItem { NodeTag type; int itemtype; /* see codes above */ - /* fields used for an operator or function item: */ - List *name; /* operator or function name */ - List *args; /* argument types */ + FuncWithArgs *name; /* operator or function name and args */ int number; /* strategy num or support proc num */ List *order_family; /* only used for ordering operators */ List *class_args; /* only used for functions */ diff --git a/src/include/parser/parse_func.h b/src/include/parser/parse_func.h index ed16d36..b1a5494 100644 --- a/src/include/parser/parse_func.h +++ b/src/include/parser/parse_func.h @@ -62,9 +62,9 @@ extern const char *func_signature_string(List *funcname, int nargs, extern Oid LookupFuncName(List *funcname, int nargs, const Oid *argtypes, bool noError); -extern Oid LookupFuncNameTypeNames(List *funcname, List *argtypes, +extern Oid LookupFuncWithArgs(FuncWithArgs *func, bool noError); -extern Oid LookupAggNameTypeNames(List *aggname, List *argtypes, +extern Oid LookupAggWithArgs(FuncWithArgs *agg, bool noError); extern void check_srf_call_placement(ParseState *pstate, int location); -- 2.10.2