database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-04-27 22:56:53 +03:00
Code

Refactor some code for ALTER TABLE SET LOGGED/UNLOGGED in tablecmds.c

Browse Source 
Both sub-commands use the same routine to switch the relpersistence of a
relation, duplicated the same checks, and used a style inconsistent with
access methods and tablespaces.

SET LOGEED/UNLOGGED is refactored to avoid any duplication, setting the
reason why a relation rewrite happens within ATPrepChangePersistence().
This shaves some code.

Discussion: https://postgr.es/m/ZiiyGFTBNkqcMQi_@paquier.xyz
This commit is contained in:
Michael Paquier 2024-08-29 15:31:30 +09:00
parent d7fe02fb9e
commit 9f87da1cff
1 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/backend/commands/tablecmds.c
View File

@ -590,7 +590,8 @@ static ObjectAddress ATExecClusterOn(Relation rel, const char *indexName,
static void ATExecDropCluster(Relation rel, LOCKMODE lockmode); static void ATExecDropCluster(Relation rel, LOCKMODE lockmode);
static void ATPrepSetAccessMethod(AlteredTableInfo *tab, Relation rel, const char *amname); static void ATPrepSetAccessMethod(AlteredTableInfo *tab, Relation rel, const char *amname);
static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethodId); static void ATExecSetAccessMethodNoStorage(Relation rel, Oid newAccessMethodId);
static bool ATPrepChangePersistence(Relation rel, bool toLogged); static void ATPrepChangePersistence(AlteredTableInfo *tab, Relation rel,
bool toLogged);
static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel,
const char *tablespacename, LOCKMODE lockmode); const char *tablespacename, LOCKMODE lockmode);
static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode); static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode);
@ -4953,33 +4954,13 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
pass = AT_PASS_MISC; pass = AT_PASS_MISC;
break; break;
case AT_SetLogged: /* SET LOGGED */ case AT_SetLogged: /* SET LOGGED */
ATSimplePermissions(cmd->subtype, rel, ATT_TABLE | ATT_SEQUENCE);
if (tab->chgPersistence)
ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot change persistence setting twice")));
tab->chgPersistence = ATPrepChangePersistence(rel, true);
/* force rewrite if necessary; see comment in ATRewriteTables */
if (tab->chgPersistence)
{
tab->rewrite |= AT_REWRITE_ALTER_PERSISTENCE;
tab->newrelpersistence = RELPERSISTENCE_PERMANENT;
}
pass = AT_PASS_MISC;
break;
case AT_SetUnLogged: /* SET UNLOGGED */ case AT_SetUnLogged: /* SET UNLOGGED */
ATSimplePermissions(cmd->subtype, rel, ATT_TABLE | ATT_SEQUENCE); ATSimplePermissions(cmd->subtype, rel, ATT_TABLE | ATT_SEQUENCE);
if (tab->chgPersistence) if (tab->chgPersistence)
ereport(ERROR, ereport(ERROR,
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED), (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
errmsg("cannot change persistence setting twice"))); errmsg("cannot change persistence setting twice")));
tab->chgPersistence = ATPrepChangePersistence(rel, false); ATPrepChangePersistence(tab, rel, cmd->subtype == AT_SetLogged);
/* force rewrite if necessary; see comment in ATRewriteTables */
if (tab->chgPersistence)
{
tab->rewrite |= AT_REWRITE_ALTER_PERSISTENCE;
tab->newrelpersistence = RELPERSISTENCE_UNLOGGED;
}
pass = AT_PASS_MISC; pass = AT_PASS_MISC;
break; break;
case AT_DropOids: /* SET WITHOUT OIDS */ case AT_DropOids: /* SET WITHOUT OIDS */
@ -16894,12 +16875,9 @@ ATExecSetCompression(Relation rel,
* This verifies that we're not trying to change a temp table. Also, * This verifies that we're not trying to change a temp table. Also,
* existing foreign key constraints are checked to avoid ending up with * existing foreign key constraints are checked to avoid ending up with
* permanent tables referencing unlogged tables. * permanent tables referencing unlogged tables.
*
* Return value is false if the operation is a no-op (in which case the
* checks are skipped), otherwise true.
*/ */
static bool static void
ATPrepChangePersistence(Relation rel, bool toLogged) ATPrepChangePersistence(AlteredTableInfo *tab, Relation rel, bool toLogged)
{ {
Relation pg_constraint; Relation pg_constraint;
HeapTuple tuple; HeapTuple tuple;
@ -16923,12 +16901,12 @@ ATPrepChangePersistence(Relation rel, bool toLogged)
case RELPERSISTENCE_PERMANENT: case RELPERSISTENCE_PERMANENT:
if (toLogged) if (toLogged)
/* nothing to do */ /* nothing to do */
return false; return;
break; break;
case RELPERSISTENCE_UNLOGGED: case RELPERSISTENCE_UNLOGGED:
if (!toLogged) if (!toLogged)
/* nothing to do */ /* nothing to do */
return false; return;
break; break;
} }
@ -17011,7 +16989,13 @@ ATPrepChangePersistence(Relation rel, bool toLogged)
table_close(pg_constraint, AccessShareLock); table_close(pg_constraint, AccessShareLock);
return true; /* force rewrite if necessary; see comment in ATRewriteTables */
tab->rewrite |= AT_REWRITE_ALTER_PERSISTENCE;
if (toLogged)
tab->newrelpersistence = RELPERSISTENCE_PERMANENT;
else
tab->newrelpersistence = RELPERSISTENCE_UNLOGGED;
tab->chgPersistence = true;
} }
/* /*