diff --git a/src/backend/catalog/index.c b/src/backend/catalog/index.c index 67b743e251..eb2b8d84c3 100644 --- a/src/backend/catalog/index.c +++ b/src/backend/catalog/index.c @@ -1330,7 +1330,7 @@ index_concurrently_create_copy(Relation heapRelation, Oid oldIndexId, indcoloptions = (int2vector *) DatumGetPointer(colOptionDatum); /* Fetch options of index if any */ - classTuple = SearchSysCache1(RELOID, oldIndexId); + classTuple = SearchSysCache1(RELOID, ObjectIdGetDatum(oldIndexId)); if (!HeapTupleIsValid(classTuple)) elog(ERROR, "cache lookup failed for relation %u", oldIndexId); optionDatum = SysCacheGetAttr(RELOID, classTuple, diff --git a/src/backend/commands/alter.c b/src/backend/commands/alter.c index d64929df55..ff8d003876 100644 --- a/src/backend/commands/alter.c +++ b/src/backend/commands/alter.c @@ -295,7 +295,8 @@ AlterObjectRename_internal(Relation rel, Oid objectId, const char *new_name) } else if (classId == SubscriptionRelationId) { - if (SearchSysCacheExists2(SUBSCRIPTIONNAME, MyDatabaseId, + if (SearchSysCacheExists2(SUBSCRIPTIONNAME, + ObjectIdGetDatum(MyDatabaseId), CStringGetDatum(new_name))) report_name_conflict(classId, new_name); diff --git a/src/backend/commands/sequence.c b/src/backend/commands/sequence.c index ef01449678..fc4f77e787 100644 --- a/src/backend/commands/sequence.c +++ b/src/backend/commands/sequence.c @@ -1718,7 +1718,7 @@ sequence_options(Oid relid) Form_pg_sequence pgsform; List *options = NIL; - pgstuple = SearchSysCache1(SEQRELID, relid); + pgstuple = SearchSysCache1(SEQRELID, ObjectIdGetDatum(relid)); if (!HeapTupleIsValid(pgstuple)) elog(ERROR, "cache lookup failed for sequence %u", relid); pgsform = (Form_pg_sequence) GETSTRUCT(pgstuple); @@ -1766,7 +1766,7 @@ pg_sequence_parameters(PG_FUNCTION_ARGS) memset(isnull, 0, sizeof(isnull)); - pgstuple = SearchSysCache1(SEQRELID, relid); + pgstuple = SearchSysCache1(SEQRELID, ObjectIdGetDatum(relid)); if (!HeapTupleIsValid(pgstuple)) elog(ERROR, "cache lookup failed for sequence %u", relid); pgsform = (Form_pg_sequence) GETSTRUCT(pgstuple); diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 4dc029f91f..727f151750 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -10147,7 +10147,7 @@ CloneFkReferenced(Relation parentRel, Relation partitionRel) Oid deleteTriggerOid, updateTriggerOid; - tuple = SearchSysCache1(CONSTROID, constrOid); + tuple = SearchSysCache1(CONSTROID, ObjectIdGetDatum(constrOid)); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for constraint %u", constrOid); constrForm = (Form_pg_constraint) GETSTRUCT(tuple); @@ -10353,7 +10353,7 @@ CloneFkReferencing(List **wqueue, Relation parentRel, Relation partRel) Oid insertTriggerOid, updateTriggerOid; - tuple = SearchSysCache1(CONSTROID, parentConstrOid); + tuple = SearchSysCache1(CONSTROID, ObjectIdGetDatum(parentConstrOid)); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for constraint %u", parentConstrOid); @@ -13723,7 +13723,7 @@ ATExecAlterColumnGenericOptions(Relation rel, /* First, determine FDW validator associated to the foreign table. */ ftrel = table_open(ForeignTableRelationId, AccessShareLock); - tuple = SearchSysCache1(FOREIGNTABLEREL, rel->rd_id); + tuple = SearchSysCache1(FOREIGNTABLEREL, ObjectIdGetDatum(rel->rd_id)); if (!HeapTupleIsValid(tuple)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), @@ -16186,7 +16186,8 @@ ATExecGenericOptions(Relation rel, List *options) ftrel = table_open(ForeignTableRelationId, RowExclusiveLock); - tuple = SearchSysCacheCopy1(FOREIGNTABLEREL, rel->rd_id); + tuple = SearchSysCacheCopy1(FOREIGNTABLEREL, + ObjectIdGetDatum(rel->rd_id)); if (!HeapTupleIsValid(tuple)) ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT), diff --git a/src/backend/commands/user.c b/src/backend/commands/user.c index 6b42d4fc34..ce77a055e5 100644 --- a/src/backend/commands/user.c +++ b/src/backend/commands/user.c @@ -1935,7 +1935,7 @@ AddRoleMems(Oid currentUserId, const char *rolename, Oid roleid, HeapTuple mrtup; Form_pg_authid mrform; - mrtup = SearchSysCache1(AUTHOID, memberid); + mrtup = SearchSysCache1(AUTHOID, ObjectIdGetDatum(memberid)); if (!HeapTupleIsValid(mrtup)) elog(ERROR, "cache lookup failed for role %u", memberid); mrform = (Form_pg_authid) GETSTRUCT(mrtup); diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c index 7c5d9110fb..5436cc302d 100644 --- a/src/backend/partitioning/partbounds.c +++ b/src/backend/partitioning/partbounds.c @@ -4313,7 +4313,7 @@ get_qual_for_range(Relation parent, PartitionBoundSpec *spec, Datum datum; PartitionBoundSpec *bspec; - tuple = SearchSysCache1(RELOID, inhrelid); + tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(inhrelid)); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for relation %u", inhrelid); diff --git a/src/backend/partitioning/partdesc.c b/src/backend/partitioning/partdesc.c index 7a2b5e57ff..65f3d5a5e6 100644 --- a/src/backend/partitioning/partdesc.c +++ b/src/backend/partitioning/partdesc.c @@ -183,7 +183,7 @@ RelationBuildPartitionDesc(Relation rel, bool omit_detached) PartitionBoundSpec *boundspec = NULL; /* Try fetching the tuple from the catcache, for speed. */ - tuple = SearchSysCache1(RELOID, inhrelid); + tuple = SearchSysCache1(RELOID, ObjectIdGetDatum(inhrelid)); if (HeapTupleIsValid(tuple)) { Datum datum; diff --git a/src/backend/utils/adt/acl.c b/src/backend/utils/adt/acl.c index 883e09393a..27eabb80ab 100644 --- a/src/backend/utils/adt/acl.c +++ b/src/backend/utils/adt/acl.c @@ -5334,13 +5334,13 @@ get_rolespec_tuple(const RoleSpec *role) case ROLESPEC_CURRENT_ROLE: case ROLESPEC_CURRENT_USER: - tuple = SearchSysCache1(AUTHOID, GetUserId()); + tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(GetUserId())); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for role %u", GetUserId()); break; case ROLESPEC_SESSION_USER: - tuple = SearchSysCache1(AUTHOID, GetSessionUserId()); + tuple = SearchSysCache1(AUTHOID, ObjectIdGetDatum(GetSessionUserId())); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for role %u", GetSessionUserId()); break; diff --git a/src/backend/utils/adt/ruleutils.c b/src/backend/utils/adt/ruleutils.c index d3a973d86b..fcb2f45f62 100644 --- a/src/backend/utils/adt/ruleutils.c +++ b/src/backend/utils/adt/ruleutils.c @@ -3283,7 +3283,7 @@ print_function_arguments(StringInfo buf, HeapTuple proctup, HeapTuple aggtup; Form_pg_aggregate agg; - aggtup = SearchSysCache1(AGGFNOID, proc->oid); + aggtup = SearchSysCache1(AGGFNOID, ObjectIdGetDatum(proc->oid)); if (!HeapTupleIsValid(aggtup)) elog(ERROR, "cache lookup failed for aggregate %u", proc->oid); diff --git a/src/backend/utils/cache/lsyscache.c b/src/backend/utils/cache/lsyscache.c index 2c01a86c29..fc6d267e44 100644 --- a/src/backend/utils/cache/lsyscache.c +++ b/src/backend/utils/cache/lsyscache.c @@ -2106,7 +2106,8 @@ get_transform_fromsql(Oid typid, Oid langid, List *trftypes) if (!list_member_oid(trftypes, typid)) return InvalidOid; - tup = SearchSysCache2(TRFTYPELANG, typid, langid); + tup = SearchSysCache2(TRFTYPELANG, ObjectIdGetDatum(typid), + ObjectIdGetDatum(langid)); if (HeapTupleIsValid(tup)) { Oid funcid; @@ -2127,7 +2128,8 @@ get_transform_tosql(Oid typid, Oid langid, List *trftypes) if (!list_member_oid(trftypes, typid)) return InvalidOid; - tup = SearchSysCache2(TRFTYPELANG, typid, langid); + tup = SearchSysCache2(TRFTYPELANG, ObjectIdGetDatum(typid), + ObjectIdGetDatum(langid)); if (HeapTupleIsValid(tup)) { Oid funcid; diff --git a/src/backend/utils/cache/partcache.c b/src/backend/utils/cache/partcache.c index 5f3516ad0c..c6c0d5a00f 100644 --- a/src/backend/utils/cache/partcache.c +++ b/src/backend/utils/cache/partcache.c @@ -365,7 +365,8 @@ generate_partition_qual(Relation rel) parent = relation_open(parentrelid, AccessShareLock); /* Get pg_class.relpartbound */ - tuple = SearchSysCache1(RELOID, RelationGetRelid(rel)); + tuple = SearchSysCache1(RELOID, + ObjectIdGetDatum(RelationGetRelid(rel))); if (!HeapTupleIsValid(tuple)) elog(ERROR, "cache lookup failed for relation %u", RelationGetRelid(rel));