diff options
| author | Robert Haas <rhaas@postgresql.org> | 2010-12-13 12:34:26 -0500 |
|---|---|---|
| committer | Robert Haas <rhaas@postgresql.org> | 2010-12-13 12:34:26 -0500 |
| commit | 5f7b58fad8f45c69bb67944779dce67e2f481995 (patch) | |
| tree | fae9ba84d982d83e9505546facfe17369909994a /src/backend/executor/execMain.c | |
| parent | 0c90442355fbbe785740669f63141f24674c8958 (diff) | |
| download | postgresql-5f7b58fad8f45c69bb67944779dce67e2f481995.tar.gz postgresql-5f7b58fad8f45c69bb67944779dce67e2f481995.zip | |
Generalize concept of temporary relations to "relation persistence".
This commit replaces pg_class.relistemp with pg_class.relpersistence;
and also modifies the RangeVar node type to carry relpersistence rather
than istemp. It also removes removes rd_istemp from RelationData and
instead performs the correct computation based on relpersistence.
For clarity, we add three new macros: RelationNeedsWAL(),
RelationUsesLocalBuffers(), and RelationUsesTempNamespace(), so that we
can clarify the purpose of each check that previous depended on
rd_istemp.
This is intended as infrastructure for the upcoming unlogged tables
patch, as well as for future possible work on global temporary tables.
Diffstat (limited to 'src/backend/executor/execMain.c')
| -rw-r--r-- | src/backend/executor/execMain.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c index 69f3a28d415..c4719f33b96 100644 --- a/src/backend/executor/execMain.c +++ b/src/backend/executor/execMain.c @@ -2131,7 +2131,8 @@ OpenIntoRel(QueryDesc *queryDesc) /* * Check consistency of arguments */ - if (into->onCommit != ONCOMMIT_NOOP && !into->rel->istemp) + if (into->onCommit != ONCOMMIT_NOOP + && into->rel->relpersistence != RELPERSISTENCE_TEMP) ereport(ERROR, (errcode(ERRCODE_INVALID_TABLE_DEFINITION), errmsg("ON COMMIT can only be used on temporary tables"))); @@ -2141,7 +2142,8 @@ OpenIntoRel(QueryDesc *queryDesc) * code. This is needed because calling code might not expect untrusted * tables to appear in pg_temp at the front of its search path. */ - if (into->rel->istemp && InSecurityRestrictedOperation()) + if (into->rel->relpersistence == RELPERSISTENCE_TEMP + && InSecurityRestrictedOperation()) ereport(ERROR, (errcode(ERRCODE_INSUFFICIENT_PRIVILEGE), errmsg("cannot create temporary table within security-restricted operation"))); @@ -2168,7 +2170,7 @@ OpenIntoRel(QueryDesc *queryDesc) } else { - tablespaceId = GetDefaultTablespace(into->rel->istemp); + tablespaceId = GetDefaultTablespace(into->rel->relpersistence); /* note InvalidOid is OK in this case */ } @@ -2208,6 +2210,7 @@ OpenIntoRel(QueryDesc *queryDesc) tupdesc, NIL, RELKIND_RELATION, + into->rel->relpersistence, false, false, true, |