>From 2f13e09885c3fed6afd3654a01815a45ba74f34f Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 6 Mar 2015 12:39:50 -0300 Subject: [PATCH 3/3] deparse/core: get_object_address support opfamily members --- src/backend/catalog/objectaddress.c | 180 ++++++++++++++++++++++++--- src/backend/commands/event_trigger.c | 2 + src/include/nodes/parsenodes.h | 2 + src/test/regress/expected/object_address.out | 32 +++-- src/test/regress/sql/object_address.sql | 12 +- 5 files changed, 194 insertions(+), 34 deletions(-) diff --git a/src/backend/catalog/objectaddress.c b/src/backend/catalog/objectaddress.c index 32eea58..b6cde3e 100644 --- a/src/backend/catalog/objectaddress.c +++ b/src/backend/catalog/objectaddress.c @@ -492,9 +492,9 @@ ObjectTypeMap[] = /* OCLASS_OPFAMILY */ { "operator family", OBJECT_OPFAMILY }, /* OCLASS_AMOP */ - { "operator of access method", -1 }, /* unmapped */ + { "operator of access method", OBJECT_AMOP }, /* OCLASS_AMPROC */ - { "function of access method", -1 }, /* unmapped */ + { "function of access method", OBJECT_AMPROC }, /* OCLASS_REWRITE */ { "rule", OBJECT_RULE }, /* OCLASS_TRIGGER */ @@ -552,9 +552,12 @@ static ObjectAddress get_object_address_attrdef(ObjectType objtype, List *objname, Relation *relp, LOCKMODE lockmode, bool missing_ok); static ObjectAddress get_object_address_type(ObjectType objtype, - List *objname, bool missing_ok); + ListCell *typecell, bool missing_ok); static ObjectAddress get_object_address_opcf(ObjectType objtype, List *objname, List *objargs, bool missing_ok); +static ObjectAddress get_object_address_opf_member(ObjectType objtype, + List *objname, List *objargs, bool missing_ok); + static ObjectAddress get_object_address_usermapping(List *objname, List *objargs, bool missing_ok); static ObjectAddress get_object_address_defacl(List *objname, List *objargs, @@ -661,7 +664,8 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, ObjectAddress domaddr; char *constrname; - domaddr = get_object_address_type(OBJECT_DOMAIN, objname, missing_ok); + domaddr = get_object_address_type(OBJECT_DOMAIN, + list_head(objname), missing_ok); constrname = strVal(linitial(objargs)); address.classId = ConstraintRelationId; @@ -685,7 +689,7 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, break; case OBJECT_TYPE: case OBJECT_DOMAIN: - address = get_object_address_type(objtype, objname, missing_ok); + address = get_object_address_type(objtype, list_head(objname), missing_ok); break; case OBJECT_AGGREGATE: address.classId = ProcedureRelationId; @@ -724,6 +728,11 @@ get_object_address(ObjectType objtype, List *objname, List *objargs, address = get_object_address_opcf(objtype, objname, objargs, missing_ok); break; + case OBJECT_AMOP: + case OBJECT_AMPROC: + address = get_object_address_opf_member(objtype, objname, + objargs, missing_ok); + break; case OBJECT_LARGEOBJECT: Assert(list_length(objname) == 1); address.classId = LargeObjectRelationId; @@ -1309,13 +1318,13 @@ get_object_address_attrdef(ObjectType objtype, List *objname, * Find the ObjectAddress for a type or domain */ static ObjectAddress -get_object_address_type(ObjectType objtype, List *objname, bool missing_ok) +get_object_address_type(ObjectType objtype, ListCell *typecell, bool missing_ok) { ObjectAddress address; TypeName *typename; Type tup; - typename = (TypeName *) linitial(objname); + typename = (TypeName *) lfirst(typecell); address.classId = TypeRelationId; address.objectId = InvalidOid; @@ -1384,6 +1393,116 @@ get_object_address_opcf(ObjectType objtype, return address; } +static ObjectAddress +get_object_address_opf_member(ObjectType objtype, + List *objname, List *objargs, bool missing_ok) +{ + ObjectAddress famaddr; + ObjectAddress typaddr; + ObjectAddress address; + ListCell *cell; + Value *amname; + List *copy; + List *amlist; + Oid lefttype; + Oid righttype; + int stratnum; + char *leftname; + char *rightname; + + /* + * last element of the objname list contains the AM name; previous-to-last + * contains the strategy or procedure number; elements prior to that contain the + * (possibly qualified) opfamily name. Create a copy of the list that we + * can scribble on to extract those values. + */ + copy = list_copy(objname); + amname = lfirst(list_tail(copy)); + amlist = list_make1(amname); + copy = list_truncate(copy, list_length(copy) - 1); + + stratnum = atoi(strVal(llast(copy))); + copy = list_truncate(copy, list_length(copy) - 1); + + /* no missing_ok support here */ + famaddr = get_object_address_opcf(OBJECT_OPFAMILY, copy, amlist, false); + + cell = list_head(objargs); + leftname = strVal(cell); + typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok); + lefttype = typaddr.objectId; + + cell = lnext(cell); + typaddr = get_object_address_type(OBJECT_TYPE, cell, missing_ok); + rightname = strVal(cell); + righttype = typaddr.objectId; + + switch (objtype) + { + case OBJECT_AMOP: + { + HeapTuple tp; + + ObjectAddressSet(address, AccessMethodOperatorRelationId, + InvalidOid); + + tp = SearchSysCache4(AMOPSTRATEGY, + ObjectIdGetDatum(famaddr.objectId), + ObjectIdGetDatum(lefttype), + ObjectIdGetDatum(righttype), + Int16GetDatum(stratnum)); + if (!HeapTupleIsValid(tp)) + { + if (!missing_ok) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("operator %d (%s, %s) of %s does not exist", + stratnum, leftname, rightname, + getObjectDescription(&famaddr)))); + } + else + { + address.objectId = HeapTupleGetOid(tp); + ReleaseSysCache(tp); + } + } + break; + + case OBJECT_AMPROC: + { + HeapTuple tp; + + ObjectAddressSet(address, AccessMethodProcedureRelationId, + InvalidOid); + + tp = SearchSysCache4(AMPROCNUM, + ObjectIdGetDatum(famaddr.objectId), + ObjectIdGetDatum(lefttype), + ObjectIdGetDatum(righttype), + Int16GetDatum(stratnum)); + if (!HeapTupleIsValid(tp)) + { + if (!missing_ok) + ereport(ERROR, + (errcode(ERRCODE_UNDEFINED_OBJECT), + errmsg("function %d (%s, %s) of %s does not exist", + stratnum, leftname, rightname, + getObjectDescription(&famaddr)))); + } + else + { + address.objectId = HeapTupleGetOid(tp); + ReleaseSysCache(tp); + } + } + break; + default: + elog(ERROR, "unrecognized objtype: %d", (int) objtype); + } + + return address; +} + /* * Find the ObjectAddress for a user mapping. */ @@ -1644,7 +1763,9 @@ pg_get_object_address(PG_FUNCTION_ARGS) if (type == OBJECT_AGGREGATE || type == OBJECT_FUNCTION || type == OBJECT_OPERATOR || - type == OBJECT_CAST) + type == OBJECT_CAST || + type == OBJECT_AMOP || + type == OBJECT_AMPROC) { /* in these cases, the args list must be of TypeName */ Datum *elems; @@ -1688,6 +1809,13 @@ pg_get_object_address(PG_FUNCTION_ARGS) (errcode(ERRCODE_INVALID_PARAMETER_VALUE), errmsg("argument list length must be exactly %d", 1))); break; + case OBJECT_AMOP: + case OBJECT_AMPROC: + if (list_length(name) < 2) + ereport(ERROR, + (errcode(ERRCODE_INVALID_PARAMETER_VALUE), + errmsg("name list length must be at least %d", 2))); + /* fall through to check args length */ case OBJECT_OPERATOR: if (list_length(args) != 2) ereport(ERROR, @@ -3736,10 +3864,6 @@ getObjectIdentityParts(const ObjectAddress *object, Form_pg_amop amopForm; StringInfoData opfam; - /* no objname support here */ - if (objname) - *objname = NIL; - amopDesc = heap_open(AccessMethodOperatorRelationId, AccessShareLock); @@ -3760,7 +3884,19 @@ getObjectIdentityParts(const ObjectAddress *object, amopForm = (Form_pg_amop) GETSTRUCT(tup); initStringInfo(&opfam); - getOpFamilyIdentity(&opfam, amopForm->amopfamily, NULL, NULL); + getOpFamilyIdentity(&opfam, amopForm->amopfamily, objname, objargs); + + if (objname) + { + *objname = lappend(*objname, + psprintf("%d", amopForm->amopstrategy)); + *objname = lappend(*objname, + llast(*objargs)); + *objargs = lappend(NIL, + format_type_be_qualified(amopForm->amoplefttype)); + *objargs = lappend(*objargs, + format_type_be_qualified(amopForm->amoprighttype)); + } appendStringInfo(&buffer, "operator %d (%s, %s) of %s", amopForm->amopstrategy, @@ -3784,10 +3920,6 @@ getObjectIdentityParts(const ObjectAddress *object, Form_pg_amproc amprocForm; StringInfoData opfam; - /* no objname support here */ - if (objname) - *objname = NIL; - amprocDesc = heap_open(AccessMethodProcedureRelationId, AccessShareLock); @@ -3808,7 +3940,19 @@ getObjectIdentityParts(const ObjectAddress *object, amprocForm = (Form_pg_amproc) GETSTRUCT(tup); initStringInfo(&opfam); - getOpFamilyIdentity(&opfam, amprocForm->amprocfamily, NULL, NULL); + getOpFamilyIdentity(&opfam, amprocForm->amprocfamily, objname, objargs); + + if (objname) + { + *objname = lappend(*objname, + psprintf("%d", amprocForm->amprocnum)); + *objname = lappend(*objname, + llast(*objargs)); + *objargs = lappend(NIL, + format_type_be_qualified(amprocForm->amproclefttype)); + *objargs = lappend(*objargs, + format_type_be_qualified(amprocForm->amprocrighttype)); + } appendStringInfo(&buffer, "function %d (%s, %s) of %s", amprocForm->amprocnum, diff --git a/src/backend/commands/event_trigger.c b/src/backend/commands/event_trigger.c index 3fec57e..4bcc327 100644 --- a/src/backend/commands/event_trigger.c +++ b/src/backend/commands/event_trigger.c @@ -1060,6 +1060,8 @@ EventTriggerSupportsObjectType(ObjectType obtype) /* no support for event triggers on event triggers */ return false; case OBJECT_AGGREGATE: + case OBJECT_AMOP: + case OBJECT_AMPROC: case OBJECT_ATTRIBUTE: case OBJECT_CAST: case OBJECT_COLUMN: diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h index 36c5d43..d969640 100644 --- a/src/include/nodes/parsenodes.h +++ b/src/include/nodes/parsenodes.h @@ -1212,6 +1212,8 @@ typedef struct SetOperationStmt typedef enum ObjectType { OBJECT_AGGREGATE, + OBJECT_AMOP, + OBJECT_AMPROC, OBJECT_ATTRIBUTE, /* type's attribute, when distinct from column */ OBJECT_CAST, OBJECT_COLUMN, diff --git a/src/test/regress/expected/object_address.out b/src/test/regress/expected/object_address.out index e7bb06a..c85f643 100644 --- a/src/test/regress/expected/object_address.out +++ b/src/test/regress/expected/object_address.out @@ -45,8 +45,7 @@ DECLARE objtype text; BEGIN FOR objtype IN VALUES ('toast table'), ('index column'), ('sequence column'), - ('toast table column'), ('view column'), ('materialized view column'), - ('operator of access method'), ('function of access method') + ('toast table column'), ('view column'), ('materialized view column') LOOP BEGIN PERFORM pg_get_object_address(objtype, '{one}', '{}'); @@ -62,8 +61,6 @@ WARNING: error for sequence column: unsupported object type "sequence column" WARNING: error for toast table column: unsupported object type "toast table column" WARNING: error for view column: unsupported object type "view column" WARNING: error for materialized view column: unsupported object type "materialized view column" -WARNING: error for operator of access method: unsupported object type "operator of access method" -WARNING: error for function of access method: unsupported object type "function of access method" DO $$ DECLARE objtype text; @@ -79,7 +76,8 @@ BEGIN ('operator'), ('operator class'), ('operator family'), ('rule'), ('trigger'), ('text search parser'), ('text search dictionary'), ('text search template'), ('text search configuration'), - ('policy'), ('user mapping'), ('default acl') + ('policy'), ('user mapping'), ('default acl'), + ('operator of access method'), ('function of access method') LOOP FOR names IN VALUES ('{eins}'), ('{addr_nsp, zwei}'), ('{eins, zwei, drei}') LOOP @@ -263,6 +261,18 @@ WARNING: error for default acl,{addr_nsp,zwei},{}: argument list length must be WARNING: error for default acl,{addr_nsp,zwei},{integer}: invalid defacl type i WARNING: error for default acl,{eins,zwei,drei},{}: argument list length must be between 1 and 2 WARNING: error for default acl,{eins,zwei,drei},{integer}: invalid defacl type i +WARNING: error for operator of access method,{eins},{}: name list length must be at least 2 +WARNING: error for operator of access method,{eins},{integer}: name list length must be at least 2 +WARNING: error for operator of access method,{addr_nsp,zwei},{}: argument list length must be exactly 2 +WARNING: error for operator of access method,{addr_nsp,zwei},{integer}: argument list length must be exactly 2 +WARNING: error for operator of access method,{eins,zwei,drei},{}: argument list length must be exactly 2 +WARNING: error for operator of access method,{eins,zwei,drei},{integer}: argument list length must be exactly 2 +WARNING: error for function of access method,{eins},{}: name list length must be at least 2 +WARNING: error for function of access method,{eins},{integer}: name list length must be at least 2 +WARNING: error for function of access method,{addr_nsp,zwei},{}: argument list length must be exactly 2 +WARNING: error for function of access method,{addr_nsp,zwei},{integer}: argument list length must be exactly 2 +WARNING: error for function of access method,{eins,zwei,drei},{}: argument list length must be exactly 2 +WARNING: error for function of access method,{eins,zwei,drei},{integer}: argument list length must be exactly 2 -- these object types cannot be qualified names SELECT pg_get_object_address('language', '{one}', '{}'); ERROR: language "one" does not exist @@ -334,8 +344,8 @@ WITH objects (type, name, args) AS (VALUES ('operator', '{+}', '{int4, int4}'), ('operator class', '{int4_ops}', '{btree}'), ('operator family', '{integer_ops}', '{btree}'), - -- operator of access method - -- function of access method + ('operator of access method', '{integer_ops,1,btree}', '{integer,integer}'), + ('function of access method', '{integer_ops,2,btree}', '{integer,integer}'), ('rule', '{addr_nsp, genview, _RETURN}', '{}'), ('trigger', '{addr_nsp, gentable, t}', '{}'), ('schema', '{addr_nsp}', '{}'), @@ -362,7 +372,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*, FROM objects, pg_get_object_address(type, name, args) addr1, pg_identify_object_as_address(classid, objid, subobjid) ioa(typ,nms,args), pg_get_object_address(typ, nms, ioa.args) as addr2 - ORDER BY addr1.classid, addr1.objid; + ORDER BY addr1.classid, addr1.objid, addr1.subobjid; type | schema | name | identity | ?column? ---------------------------+------------+-------------------+----------------------------------------------------------------------+---------- default acl | | | for role regtest_addr_user in schema public on tables | t @@ -379,12 +389,14 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*, index | addr_nsp | gentable_pkey | addr_nsp.gentable_pkey | t view | addr_nsp | genview | addr_nsp.genview | t materialized view | addr_nsp | genmatview | addr_nsp.genmatview | t - foreign table column | addr_nsp | genftable | addr_nsp.genftable.a | t foreign table | addr_nsp | genftable | addr_nsp.genftable | t + foreign table column | addr_nsp | genftable | addr_nsp.genftable.a | t role | | regtest_addr_user | regtest_addr_user | t server | | addr_fserv | addr_fserv | t user mapping | | | regtest_addr_user on server integer | t foreign-data wrapper | | addr_fdw | addr_fdw | t + operator of access method | | | operator 1 (integer, integer) of pg_catalog.integer_ops USING btree | t + function of access method | | | function 2 (integer, integer) of pg_catalog.integer_ops USING btree | t default value | | | for addr_nsp.gentable.b | t cast | | | (bigint AS integer) | t table constraint | addr_nsp | | a_chk on addr_nsp.gentable | t @@ -403,7 +415,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*, text search parser | addr_nsp | addr_ts_prs | addr_nsp.addr_ts_prs | t text search configuration | addr_nsp | addr_ts_conf | addr_nsp.addr_ts_conf | t text search template | addr_nsp | addr_ts_temp | addr_nsp.addr_ts_temp | t -(38 rows) +(40 rows) --- --- Cleanup resources diff --git a/src/test/regress/sql/object_address.sql b/src/test/regress/sql/object_address.sql index f4d940c..e1be6bf 100644 --- a/src/test/regress/sql/object_address.sql +++ b/src/test/regress/sql/object_address.sql @@ -48,8 +48,7 @@ DECLARE objtype text; BEGIN FOR objtype IN VALUES ('toast table'), ('index column'), ('sequence column'), - ('toast table column'), ('view column'), ('materialized view column'), - ('operator of access method'), ('function of access method') + ('toast table column'), ('view column'), ('materialized view column') LOOP BEGIN PERFORM pg_get_object_address(objtype, '{one}', '{}'); @@ -75,7 +74,8 @@ BEGIN ('operator'), ('operator class'), ('operator family'), ('rule'), ('trigger'), ('text search parser'), ('text search dictionary'), ('text search template'), ('text search configuration'), - ('policy'), ('user mapping'), ('default acl') + ('policy'), ('user mapping'), ('default acl'), + ('operator of access method'), ('function of access method') LOOP FOR names IN VALUES ('{eins}'), ('{addr_nsp, zwei}'), ('{eins, zwei, drei}') LOOP @@ -143,8 +143,8 @@ WITH objects (type, name, args) AS (VALUES ('operator', '{+}', '{int4, int4}'), ('operator class', '{int4_ops}', '{btree}'), ('operator family', '{integer_ops}', '{btree}'), - -- operator of access method - -- function of access method + ('operator of access method', '{integer_ops,1,btree}', '{integer,integer}'), + ('function of access method', '{integer_ops,2,btree}', '{integer,integer}'), ('rule', '{addr_nsp, genview, _RETURN}', '{}'), ('trigger', '{addr_nsp, gentable, t}', '{}'), ('schema', '{addr_nsp}', '{}'), @@ -171,7 +171,7 @@ SELECT (pg_identify_object(addr1.classid, addr1.objid, addr1.subobjid)).*, FROM objects, pg_get_object_address(type, name, args) addr1, pg_identify_object_as_address(classid, objid, subobjid) ioa(typ,nms,args), pg_get_object_address(typ, nms, ioa.args) as addr2 - ORDER BY addr1.classid, addr1.objid; + ORDER BY addr1.classid, addr1.objid, addr1.subobjid; --- --- Cleanup resources -- 2.1.4