database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Get rid of SET LOGGED indexes persistence kludge

Browse Source 
This removes ATChangeIndexesPersistence() introduced by f41872d0c1
which was too ugly to live for long.  Instead, the correct persistence
marking is passed all the way down to reindex_index, so that the
transient relation built to contain the index relfilenode can
get marked correctly right from the start.

Author: Fabrízio de Royes Mello
Review and editorialization by Michael Paquier
                                     and Álvaro Herrera
This commit is contained in:
Alvaro Herrera
2014-11-15 01:19:49 -03:00
parent e4d1e26491
commit 85b506bbfc
8 changed files with 56 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/backend/commands/cluster.c
View File

@ -589,7 +589,8 @@ rebuild_relation(Relation OldHeap, Oid indexOid, bool verbose)
*/
finish_heap_swap(tableOid, OIDNewHeap, is_system_catalog,
swap_toast_by_content, false, true,
frozenXid, cutoffMulti);
frozenXid, cutoffMulti,
OldHeap->rd_rel->relpersistence);
}
@ -1475,7 +1476,8 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
bool check_constraints,
bool is_internal,
TransactionId frozenXid,
MultiXactId cutoffMulti)
MultiXactId cutoffMulti,
char newrelpersistence)
{
ObjectAddress object;
Oid mapped_tables[4];
@ -1519,6 +1521,16 @@ finish_heap_swap(Oid OIDOldHeap, Oid OIDNewHeap,
reindex_flags = REINDEX_REL_SUPPRESS_INDEX_USE;
if (check_constraints)
reindex_flags |= REINDEX_REL_CHECK_CONSTRAINTS;
/*
* Ensure that the indexes have the same persistence as the parent
* relation.
*/
if (newrelpersistence == RELPERSISTENCE_UNLOGGED)
reindex_flags |= REINDEX_REL_FORCE_INDEXES_UNLOGGED;
else if (newrelpersistence == RELPERSISTENCE_PERMANENT)
reindex_flags |= REINDEX_REL_FORCE_INDEXES_PERMANENT;
reindex_relation(OIDOldHeap, reindex_flags);
/*

2
src/backend/commands/indexcmds.c
View File

@ -1689,7 +1689,7 @@ ReindexIndex(RangeVar *indexRelation)
RangeVarCallbackForReindexIndex,
(void *) &heapOid);
reindex_index(indOid, false);
reindex_index(indOid, false, indexRelation->relpersistence);
return indOid;
}

8
src/backend/commands/matview.c
View File

@ -67,7 +67,7 @@ static void mv_GenerateOper(StringInfo buf, Oid opoid);
static void refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
int save_sec_context);
static void refresh_by_heap_swap(Oid matviewOid, Oid OIDNewHeap);
static void refresh_by_heap_swap(Oid matviewOid, Oid OIDNewHeap, char relpersistence);
static void OpenMatViewIncrementalMaintenance(void);
static void CloseMatViewIncrementalMaintenance(void);
@ -303,7 +303,7 @@ ExecRefreshMatView(RefreshMatViewStmt *stmt, const char *queryString,
Assert(matview_maintenance_depth == old_depth);
}
else
refresh_by_heap_swap(matviewOid, OIDNewHeap);
refresh_by_heap_swap(matviewOid, OIDNewHeap, relpersistence);
/* Roll back any GUC changes */
AtEOXact_GUC(false, save_nestlevel);
@ -759,10 +759,10 @@ refresh_by_match_merge(Oid matviewOid, Oid tempOid, Oid relowner,
* swapping is handled by the called function, so it is not needed here.
*/
static void
refresh_by_heap_swap(Oid matviewOid, Oid OIDNewHeap)
refresh_by_heap_swap(Oid matviewOid, Oid OIDNewHeap, char relpersistence)
{
finish_heap_swap(matviewOid, OIDNewHeap, false, false, true, true,
RecentXmin, ReadNextMultiXactId());
RecentXmin, ReadNextMultiXactId(), relpersistence);
}

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

@ -393,7 +393,6 @@ static void ATExecClusterOn(Relation rel, const char *indexName,
LOCKMODE lockmode);
static void ATExecDropCluster(Relation rel, LOCKMODE lockmode);
static bool ATPrepChangePersistence(Relation rel, bool toLogged);
static void ATChangeIndexesPersistence(Oid relid, char relpersistence);
static void ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel,
char *tablespacename, LOCKMODE lockmode);
static void ATExecSetTableSpace(Oid tableOid, Oid newTableSpace, LOCKMODE lockmode);
@ -3734,16 +3733,6 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode)
*/
ATRewriteTable(tab, OIDNewHeap, lockmode);
/*
* Change the persistence marking of indexes, if necessary. This
* is so that the new copies are built with the right persistence
* in the reindex step below. Note we cannot do this earlier,
* because the rewrite step might read the indexes, and that would
* cause buffers for them to have the wrong setting.
*/
if (tab->chgPersistence)
ATChangeIndexesPersistence(tab->relid, tab->newrelpersistence);
/*
* Swap the physical files of the old and new heaps, then rebuild
* indexes and discard the old heap. We can use RecentXmin for
@ -3756,7 +3745,8 @@ ATRewriteTables(List **wqueue, LOCKMODE lockmode)
false, false, true,
!OidIsValid(tab->newTableSpace),
RecentXmin,
ReadNextMultiXactId());
ReadNextMultiXactId(),
persistence);
}
else
{
@ -10879,48 +10869,6 @@ ATPrepChangePersistence(Relation rel, bool toLogged)
return true;
}
/*
* Update the pg_class entry of each index for the given relation to the
* given persistence.
*/
static void
ATChangeIndexesPersistence(Oid relid, char relpersistence)
{
Relation rel;
Relation pg_class;
List *indexes;
ListCell *cell;
pg_class = heap_open(RelationRelationId, RowExclusiveLock);
/* We already have a lock on the table */
rel = relation_open(relid, NoLock);
indexes = RelationGetIndexList(rel);
foreach(cell, indexes)
{
Oid indexid = lfirst_oid(cell);
HeapTuple tuple;
Form_pg_class pg_class_form;
tuple = SearchSysCacheCopy1(RELOID, ObjectIdGetDatum(indexid));
if (!HeapTupleIsValid(tuple))
elog(ERROR, "cache lookup failed for relation %u",
indexid);
pg_class_form = (Form_pg_class) GETSTRUCT(tuple);
pg_class_form->relpersistence = relpersistence;
simple_heap_update(pg_class, &tuple->t_self, tuple);
/* keep catalog indexes current */
CatalogUpdateIndexes(pg_class, tuple);
heap_freetuple(tuple);
}
heap_close(pg_class, RowExclusiveLock);
heap_close(rel, NoLock);
}
/*
* Execute ALTER TABLE SET SCHEMA
*/