diff options
| author | Andres Freund <andres@anarazel.de> | 2018-03-30 16:33:42 -0700 |
|---|---|---|
| committer | Andres Freund <andres@anarazel.de> | 2018-03-30 17:05:16 -0700 |
| commit | d87510a524f36a630cfb34cc392e95e959a1b0dc (patch) | |
| tree | 0ec7d1d6409add64be63fc71f491c75a33d4df47 /src/backend/commands/tablecmds.c | |
| parent | 9a895462d940c0694042059f90e5f63a0a517ded (diff) | |
| download | postgresql-d87510a524f36a630cfb34cc392e95e959a1b0dc.tar.gz postgresql-d87510a524f36a630cfb34cc392e95e959a1b0dc.zip | |
Combine options for RangeVarGetRelidExtended() into a flags argument.
A followup patch will add a SKIP_LOCKED option. To avoid introducing
evermore arguments, breaking existing callers each time, introduce a
flags argument. This'll no doubt break a few external users...
Also change the MISSING_OK behaviour so a DEBUG1 debug message is
emitted when a relation is not found.
Author: Nathan Bossart
Reviewed-By: Michael Paquier and Andres Freund
Discussion: https://postgr.es/m/20180306005349.b65whmvj7z6hbe2y@alap3.anarazel.de
Diffstat (limited to 'src/backend/commands/tablecmds.c')
| -rw-r--r-- | src/backend/commands/tablecmds.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 83a881eff38..c8da82217d4 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -1159,8 +1159,7 @@ RemoveRelations(DropStmt *drop) state.heapOid = InvalidOid; state.partParentOid = InvalidOid; state.concurrent = drop->concurrent; - relOid = RangeVarGetRelidExtended(rel, lockmode, true, - false, + relOid = RangeVarGetRelidExtended(rel, lockmode, RVR_MISSING_OK, RangeVarCallbackForDropRelation, (void *) &state); @@ -2793,7 +2792,7 @@ renameatt(RenameStmt *stmt) /* lock level taken here should match renameatt_internal */ relid = RangeVarGetRelidExtended(stmt->relation, AccessExclusiveLock, - stmt->missing_ok, false, + stmt->missing_ok ? RVR_MISSING_OK : 0, RangeVarCallbackForRenameAttribute, NULL); @@ -2945,7 +2944,7 @@ RenameConstraint(RenameStmt *stmt) { /* lock level taken here should match rename_constraint_internal */ relid = RangeVarGetRelidExtended(stmt->relation, AccessExclusiveLock, - stmt->missing_ok, false, + stmt->missing_ok ? RVR_MISSING_OK : 0, RangeVarCallbackForRenameAttribute, NULL); if (!OidIsValid(relid)) @@ -2987,7 +2986,7 @@ RenameRelation(RenameStmt *stmt) * escalation. */ relid = RangeVarGetRelidExtended(stmt->relation, AccessExclusiveLock, - stmt->missing_ok, false, + stmt->missing_ok ? RVR_MISSING_OK : 0, RangeVarCallbackForAlterRelation, (void *) stmt); @@ -3146,7 +3145,8 @@ CheckTableNotInUse(Relation rel, const char *stmt) Oid AlterTableLookupRelation(AlterTableStmt *stmt, LOCKMODE lockmode) { - return RangeVarGetRelidExtended(stmt->relation, lockmode, stmt->missing_ok, false, + return RangeVarGetRelidExtended(stmt->relation, lockmode, + stmt->missing_ok ? RVR_MISSING_OK : 0, RangeVarCallbackForAlterRelation, (void *) stmt); } @@ -12683,7 +12683,7 @@ AlterTableNamespace(AlterObjectSchemaStmt *stmt, Oid *oldschema) ObjectAddress myself; relid = RangeVarGetRelidExtended(stmt->relation, AccessExclusiveLock, - stmt->missing_ok, false, + stmt->missing_ok ? RVR_MISSING_OK : 0, RangeVarCallbackForAlterRelation, (void *) stmt); @@ -14613,7 +14613,7 @@ ATExecAttachPartitionIdx(List **wqueue, Relation parentIdx, RangeVar *name) state.parentTblOid = parentIdx->rd_index->indrelid; state.lockedParentTbl = false; partIdxId = - RangeVarGetRelidExtended(name, AccessExclusiveLock, false, false, + RangeVarGetRelidExtended(name, AccessExclusiveLock, 0, RangeVarCallbackForAttachIndex, (void *) &state); /* Not there? */ |