diff options
| author | Peter Eisentraut <peter_e@gmx.net> | 2003-01-12 18:19:37 +0000 |
|---|---|---|
| committer | Peter Eisentraut <peter_e@gmx.net> | 2003-01-12 18:19:37 +0000 |
| commit | 13437d1e9c28cdcd0e98a7a8a00113b9d8e7dc4f (patch) | |
| tree | 3170aa691f0549e82fb59d6d00ac226297b0130b /src | |
| parent | 6f4855842c2f45223c9e044ee2c0d57adf5a5fc8 (diff) | |
| download | postgresql-13437d1e9c28cdcd0e98a7a8a00113b9d8e7dc4f.tar.gz postgresql-13437d1e9c28cdcd0e98a7a8a00113b9d8e7dc4f.zip | |
Replace RelidGetNamespaceId() by get_rel_namespace().
Diffstat (limited to 'src')
| -rw-r--r-- | src/backend/catalog/namespace.c | 25 | ||||
| -rw-r--r-- | src/backend/executor/execMain.c | 4 | ||||
| -rw-r--r-- | src/include/catalog/namespace.h | 3 |
3 files changed, 4 insertions, 28 deletions
diff --git a/src/backend/catalog/namespace.c b/src/backend/catalog/namespace.c index d58313a2ee0..723355ac898 100644 --- a/src/backend/catalog/namespace.c +++ b/src/backend/catalog/namespace.c @@ -13,7 +13,7 @@ * Portions Copyright (c) 1994, Regents of the University of California * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.44 2003/01/10 22:03:27 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/catalog/namespace.c,v 1.45 2003/01/12 18:19:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -278,29 +278,6 @@ RelnameGetRelid(const char *relname) return InvalidOid; } -/* - * RelidGetNamespaceId - * Given a relation OID, return the namespace OID. - */ -Oid -RelidGetNamespaceId(Oid relid) -{ - HeapTuple tuple; - Form_pg_class pg_class_form; - Oid result; - - tuple = SearchSysCache(RELOID, - ObjectIdGetDatum(relid), - 0, 0, 0); - if (!HeapTupleIsValid(tuple)) - elog(ERROR, "cache lookup failed for relation %u", relid); - pg_class_form = (Form_pg_class) GETSTRUCT(tuple); - - result = pg_class_form->relnamespace; - ReleaseSysCache(tuple); - return result; -} - /* * RelationIsVisible diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index a1a8134a6a7..04aed372c00 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -26,7 +26,7 @@ * * * IDENTIFICATION - * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.197 2003/01/10 22:03:27 petere Exp $ + * $Header: /cvsroot/pgsql/src/backend/executor/execMain.c,v 1.198 2003/01/12 18:19:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -419,7 +419,7 @@ ExecCheckXactReadOnly(Query *parsetree, CmdType operation) if (!rte->checkForWrite) continue; - if (isTempNamespace(RelidGetNamespaceId(rte->relid))) + if (isTempNamespace(get_rel_namespace(rte->relid))) continue; goto fail; diff --git a/src/include/catalog/namespace.h b/src/include/catalog/namespace.h index efd5ae32786..6e9522bcd96 100644 --- a/src/include/catalog/namespace.h +++ b/src/include/catalog/namespace.h @@ -7,7 +7,7 @@ * Portions Copyright (c) 1996-2002, PostgreSQL Global Development Group * Portions Copyright (c) 1994, Regents of the University of California * - * $Id: namespace.h,v 1.25 2003/01/10 22:03:30 petere Exp $ + * $Id: namespace.h,v 1.26 2003/01/12 18:19:37 petere Exp $ * *------------------------------------------------------------------------- */ @@ -51,7 +51,6 @@ typedef struct _OpclassCandidateList extern Oid RangeVarGetRelid(const RangeVar *relation, bool failOK); extern Oid RangeVarGetCreationNamespace(const RangeVar *newRelation); extern Oid RelnameGetRelid(const char *relname); -extern Oid RelidGetNamespaceId(Oid relid); extern bool RelationIsVisible(Oid relid); extern Oid TypenameGetTypid(const char *typname); |