Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit81e334c

Browse files
committed
Set the metapage's pd_lower correctly in brin, gin, and spgist indexes.
Previously, these index types left the pd_lower field set to the defaultSizeOfPageHeaderData, which is really a lie because it ought to point pastwhatever space is being used for metadata. The coding accidentally failedto fail because we never told xlog.c that the metapage is of standardformat --- but that's not very good, because it impedes WAL consistencychecking, and in some cases prevents compression of full-page images.To fix, ensure that we set pd_lower correctly, not only when creating ametapage but whenever we write it out (these apparently redundant steps areneeded to cope with pg_upgrade'd indexes that don't yet contain the rightvalue). This allows telling xlog.c that the page is of standard format.The WAL consistency check mask functions are made to mask only if pd_lowerappears valid, which I think is likely unnecessary complication, sinceany metapage appearing in a v11 WAL stream should contain valid pd_lower.But it doesn't cost much to be paranoid.Amit Langote, reviewed by Michael Paquier and Amit KapilaDiscussion:https://postgr.es/m/0d273805-0e9e-ec1a-cb84-d4da400b8f85@lab.ntt.co.jp
1 parent6976a4f commit81e334c

File tree

11 files changed

+125
-35
lines changed

11 files changed

+125
-35
lines changed

‎src/backend/access/brin/brin.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -685,7 +685,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
685685

686686
XLogBeginInsert();
687687
XLogRegisterData((char*)&xlrec,SizeOfBrinCreateIdx);
688-
XLogRegisterBuffer(0,meta,REGBUF_WILL_INIT);
688+
XLogRegisterBuffer(0,meta,REGBUF_WILL_INIT |REGBUF_STANDARD);
689689

690690
recptr=XLogInsert(RM_BRIN_ID,XLOG_BRIN_CREATE_INDEX);
691691

@@ -742,7 +742,7 @@ brinbuildempty(Relation index)
742742
brin_metapage_init(BufferGetPage(metabuf),BrinGetPagesPerRange(index),
743743
BRIN_CURRENT_VERSION);
744744
MarkBufferDirty(metabuf);
745-
log_newpage_buffer(metabuf,false);
745+
log_newpage_buffer(metabuf,true);
746746
END_CRIT_SECTION();
747747

748748
UnlockReleaseBuffer(metabuf);

‎src/backend/access/brin/brin_pageops.c‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,7 @@ brin_page_init(Page page, uint16 type)
476476
}
477477

478478
/*
479-
* Initialize a new BRIN index' metapage.
479+
* Initialize a new BRIN index's metapage.
480480
*/
481481
void
482482
brin_metapage_init(Pagepage,BlockNumberpagesPerRange,uint16version)
@@ -497,6 +497,14 @@ brin_metapage_init(Page page, BlockNumber pagesPerRange, uint16 version)
497497
* revmap page to be created when the index is.
498498
*/
499499
metadata->lastRevmapPage=0;
500+
501+
/*
502+
* Set pd_lower just past the end of the metadata. This is essential,
503+
* because without doing so, metadata will be lost if xlog.c compresses
504+
* the page.
505+
*/
506+
((PageHeader)page)->pd_lower=
507+
((char*)metadata+sizeof(BrinMetaPageData))- (char*)page;
500508
}
501509

502510
/*

‎src/backend/access/brin/brin_revmap.c‎

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -615,7 +615,7 @@ revmap_physical_extend(BrinRevmap *revmap)
615615

616616
/*
617617
* Ok, we have now locked the metapage and the target block. Re-initialize
618-
*itas a revmap page.
618+
*the target blockas a revmap page, and update the metapage.
619619
*/
620620
START_CRIT_SECTION();
621621

@@ -624,6 +624,17 @@ revmap_physical_extend(BrinRevmap *revmap)
624624
MarkBufferDirty(buf);
625625

626626
metadata->lastRevmapPage=mapBlk;
627+
628+
/*
629+
* Set pd_lower just past the end of the metadata. This is essential,
630+
* because without doing so, metadata will be lost if xlog.c compresses
631+
* the page. (We must do this here because pre-v11 versions of PG did not
632+
* set the metapage's pd_lower correctly, so a pg_upgraded index might
633+
* contain the wrong value.)
634+
*/
635+
((PageHeader)metapage)->pd_lower=
636+
((char*)metadata+sizeof(BrinMetaPageData))- (char*)metapage;
637+
627638
MarkBufferDirty(revmap->rm_metaBuf);
628639

629640
if (RelationNeedsWAL(revmap->rm_irel))
@@ -635,7 +646,7 @@ revmap_physical_extend(BrinRevmap *revmap)
635646

636647
XLogBeginInsert();
637648
XLogRegisterData((char*)&xlrec,SizeOfBrinRevmapExtend);
638-
XLogRegisterBuffer(0,revmap->rm_metaBuf,0);
649+
XLogRegisterBuffer(0,revmap->rm_metaBuf,REGBUF_STANDARD);
639650

640651
XLogRegisterBuffer(1,buf,REGBUF_WILL_INIT);
641652

‎src/backend/access/brin/brin_xlog.c‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,17 @@ brin_xlog_revmap_extend(XLogReaderState *record)
234234
metadata->lastRevmapPage=xlrec->targetBlk;
235235

236236
PageSetLSN(metapg,lsn);
237+
238+
/*
239+
* Set pd_lower just past the end of the metadata. This is essential,
240+
* because without doing so, metadata will be lost if xlog.c
241+
* compresses the page. (We must do this here because pre-v11
242+
* versions of PG did not set the metapage's pd_lower correctly, so a
243+
* pg_upgraded index might contain the wrong value.)
244+
*/
245+
((PageHeader)metapg)->pd_lower=
246+
((char*)metadata+sizeof(BrinMetaPageData))- (char*)metapg;
247+
237248
MarkBufferDirty(metabuf);
238249
}
239250

@@ -331,14 +342,20 @@ void
331342
brin_mask(char*pagedata,BlockNumberblkno)
332343
{
333344
Pagepage= (Page)pagedata;
345+
PageHeaderpagehdr= (PageHeader)page;
334346

335347
mask_page_lsn_and_checksum(page);
336348

337349
mask_page_hint_bits(page);
338350

339-
if (BRIN_IS_REGULAR_PAGE(page))
351+
/*
352+
* Regular brin pages contain unused space which needs to be masked.
353+
* Similarly for meta pages, but mask it only if pd_lower appears to have
354+
* been set correctly.
355+
*/
356+
if (BRIN_IS_REGULAR_PAGE(page)||
357+
(BRIN_IS_META_PAGE(page)&&pagehdr->pd_lower>SizeOfPageHeaderData))
340358
{
341-
/* Regular brin pages contain unused space which needs to be masked. */
342359
mask_unused_space(page);
343360
}
344361
}

‎src/backend/access/gin/ginfast.c‎

Lines changed: 23 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,6 +396,16 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
396396
MarkBufferDirty(buffer);
397397
}
398398

399+
/*
400+
* Set pd_lower just past the end of the metadata. This is essential,
401+
* because without doing so, metadata will be lost if xlog.c compresses
402+
* the page. (We must do this here because pre-v11 versions of PG did not
403+
* set the metapage's pd_lower correctly, so a pg_upgraded index might
404+
* contain the wrong value.)
405+
*/
406+
((PageHeader)metapage)->pd_lower=
407+
((char*)metadata+sizeof(GinMetaPageData))- (char*)metapage;
408+
399409
/*
400410
* Write metabuffer, make xlog entry
401411
*/
@@ -407,7 +417,7 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
407417

408418
memcpy(&data.metadata,metadata,sizeof(GinMetaPageData));
409419

410-
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT);
420+
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
411421
XLogRegisterData((char*)&data,sizeof(ginxlogUpdateMeta));
412422

413423
recptr=XLogInsert(RM_GIN_ID,XLOG_GIN_UPDATE_META_PAGE);
@@ -572,6 +582,16 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
572582
metadata->nPendingHeapTuples=0;
573583
}
574584

585+
/*
586+
* Set pd_lower just past the end of the metadata. This is essential,
587+
* because without doing so, metadata will be lost if xlog.c
588+
* compresses the page. (We must do this here because pre-v11
589+
* versions of PG did not set the metapage's pd_lower correctly, so a
590+
* pg_upgraded index might contain the wrong value.)
591+
*/
592+
((PageHeader)metapage)->pd_lower=
593+
((char*)metadata+sizeof(GinMetaPageData))- (char*)metapage;
594+
575595
MarkBufferDirty(metabuffer);
576596

577597
for (i=0;i<data.ndeleted;i++)
@@ -586,7 +606,8 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
586606
XLogRecPtrrecptr;
587607

588608
XLogBeginInsert();
589-
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT);
609+
XLogRegisterBuffer(0,metabuffer,
610+
REGBUF_WILL_INIT |REGBUF_STANDARD);
590611
for (i=0;i<data.ndeleted;i++)
591612
XLogRegisterBuffer(i+1,buffers[i],REGBUF_WILL_INIT);
592613

@@ -968,7 +989,6 @@ ginInsertCleanup(GinState *ginstate, bool full_clean,
968989
if (fsm_vac&&fill_fsm)
969990
IndexFreeSpaceMapVacuum(index);
970991

971-
972992
/* Clean up temporary space */
973993
MemoryContextSwitchTo(oldCtx);
974994
MemoryContextDelete(opCtx);

‎src/backend/access/gin/gininsert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
348348
Pagepage;
349349

350350
XLogBeginInsert();
351-
XLogRegisterBuffer(0,MetaBuffer,REGBUF_WILL_INIT);
351+
XLogRegisterBuffer(0,MetaBuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
352352
XLogRegisterBuffer(1,RootBuffer,REGBUF_WILL_INIT);
353353

354354
recptr=XLogInsert(RM_GIN_ID,XLOG_GIN_CREATE_INDEX);
@@ -447,7 +447,7 @@ ginbuildempty(Relation index)
447447
START_CRIT_SECTION();
448448
GinInitMetabuffer(MetaBuffer);
449449
MarkBufferDirty(MetaBuffer);
450-
log_newpage_buffer(MetaBuffer,false);
450+
log_newpage_buffer(MetaBuffer,true);
451451
GinInitBuffer(RootBuffer,GIN_LEAF);
452452
MarkBufferDirty(RootBuffer);
453453
log_newpage_buffer(RootBuffer, false);

‎src/backend/access/gin/ginutil.c‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -374,6 +374,14 @@ GinInitMetabuffer(Buffer b)
374374
metadata->nDataPages=0;
375375
metadata->nEntries=0;
376376
metadata->ginVersion=GIN_CURRENT_VERSION;
377+
378+
/*
379+
* Set pd_lower just past the end of the metadata. This is essential,
380+
* because without doing so, metadata will be lost if xlog.c compresses
381+
* the page.
382+
*/
383+
((PageHeader)page)->pd_lower=
384+
((char*)metadata+sizeof(GinMetaPageData))- (char*)page;
377385
}
378386

379387
/*
@@ -676,6 +684,16 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
676684
metadata->nDataPages=stats->nDataPages;
677685
metadata->nEntries=stats->nEntries;
678686

687+
/*
688+
* Set pd_lower just past the end of the metadata. This is essential,
689+
* because without doing so, metadata will be lost if xlog.c compresses
690+
* the page. (We must do this here because pre-v11 versions of PG did not
691+
* set the metapage's pd_lower correctly, so a pg_upgraded index might
692+
* contain the wrong value.)
693+
*/
694+
((PageHeader)metapage)->pd_lower=
695+
((char*)metadata+sizeof(GinMetaPageData))- (char*)metapage;
696+
679697
MarkBufferDirty(metabuffer);
680698

681699
if (RelationNeedsWAL(index))
@@ -690,7 +708,7 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
690708

691709
XLogBeginInsert();
692710
XLogRegisterData((char*)&data,sizeof(ginxlogUpdateMeta));
693-
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT);
711+
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
694712

695713
recptr=XLogInsert(RM_GIN_ID,XLOG_GIN_UPDATE_META_PAGE);
696714
PageSetLSN(metapage,recptr);

‎src/backend/access/gin/ginxlog.c‎

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -514,7 +514,7 @@ ginRedoUpdateMetapage(XLogReaderState *record)
514514
Assert(BufferGetBlockNumber(metabuffer)==GIN_METAPAGE_BLKNO);
515515
metapage=BufferGetPage(metabuffer);
516516

517-
GinInitPage(metapage,GIN_META,BufferGetPageSize(metabuffer));
517+
GinInitMetabuffer(metabuffer);
518518
memcpy(GinPageGetMeta(metapage),&data->metadata,sizeof(GinMetaPageData));
519519
PageSetLSN(metapage,lsn);
520520
MarkBufferDirty(metabuffer);
@@ -656,7 +656,7 @@ ginRedoDeleteListPages(XLogReaderState *record)
656656
Assert(BufferGetBlockNumber(metabuffer)==GIN_METAPAGE_BLKNO);
657657
metapage=BufferGetPage(metabuffer);
658658

659-
GinInitPage(metapage,GIN_META,BufferGetPageSize(metabuffer));
659+
GinInitMetabuffer(metabuffer);
660660

661661
memcpy(GinPageGetMeta(metapage),&data->metadata,sizeof(GinMetaPageData));
662662
PageSetLSN(metapage,lsn);
@@ -768,6 +768,7 @@ void
768768
gin_mask(char*pagedata,BlockNumberblkno)
769769
{
770770
Pagepage= (Page)pagedata;
771+
PageHeaderpagehdr= (PageHeader)page;
771772
GinPageOpaqueopaque;
772773

773774
mask_page_lsn_and_checksum(page);
@@ -776,18 +777,12 @@ gin_mask(char *pagedata, BlockNumber blkno)
776777
mask_page_hint_bits(page);
777778

778779
/*
779-
* GIN metapage doesn't use pd_lower/pd_upper. Other page types do. Hence,
780-
* we need to apply masking for those pages.
780+
* For a GIN_DELETED page, the page is initialized to empty. Hence, mask
781+
* the whole page content. For other pages, mask the hole if pd_lower
782+
* appears to have been set correctly.
781783
*/
782-
if (opaque->flags!=GIN_META)
783-
{
784-
/*
785-
* For GIN_DELETED page, the page is initialized to empty. Hence, mask
786-
* the page content.
787-
*/
788-
if (opaque->flags&GIN_DELETED)
789-
mask_page_content(page);
790-
else
791-
mask_unused_space(page);
792-
}
784+
if (opaque->flags&GIN_DELETED)
785+
mask_page_content(page);
786+
elseif (pagehdr->pd_lower>SizeOfPageHeaderData)
787+
mask_unused_space(page);
793788
}

‎src/backend/access/spgist/spginsert.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ spgbuild(Relation heap, Relation index, IndexInfo *indexInfo)
110110
* Replay will re-initialize the pages, so don't take full pages
111111
* images. No other data to log.
112112
*/
113-
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT);
113+
XLogRegisterBuffer(0,metabuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
114114
XLogRegisterBuffer(1,rootbuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
115115
XLogRegisterBuffer(2,nullbuffer,REGBUF_WILL_INIT |REGBUF_STANDARD);
116116

@@ -173,7 +173,7 @@ spgbuildempty(Relation index)
173173
smgrwrite(index->rd_smgr,INIT_FORKNUM,SPGIST_METAPAGE_BLKNO,
174174
(char*)page, true);
175175
log_newpage(&index->rd_smgr->smgr_rnode.node,INIT_FORKNUM,
176-
SPGIST_METAPAGE_BLKNO,page,false);
176+
SPGIST_METAPAGE_BLKNO,page,true);
177177

178178
/* Likewise for the root page. */
179179
SpGistInitPage(page,SPGIST_LEAF);

‎src/backend/access/spgist/spgutils.c‎

Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,27 @@ SpGistUpdateMetaPage(Relation index)
256256
if (cache!=NULL)
257257
{
258258
Buffermetabuffer;
259-
SpGistMetaPageData*metadata;
260259

261260
metabuffer=ReadBuffer(index,SPGIST_METAPAGE_BLKNO);
262261

263262
if (ConditionalLockBuffer(metabuffer))
264263
{
265-
metadata=SpGistPageGetMeta(BufferGetPage(metabuffer));
264+
Pagemetapage=BufferGetPage(metabuffer);
265+
SpGistMetaPageData*metadata=SpGistPageGetMeta(metapage);
266+
266267
metadata->lastUsedPages=cache->lastUsedPages;
267268

269+
/*
270+
* Set pd_lower just past the end of the metadata. This is
271+
* essential, because without doing so, metadata will be lost if
272+
* xlog.c compresses the page. (We must do this here because
273+
* pre-v11 versions of PG did not set the metapage's pd_lower
274+
* correctly, so a pg_upgraded index might contain the wrong
275+
* value.)
276+
*/
277+
((PageHeader)metapage)->pd_lower=
278+
((char*)metadata+sizeof(SpGistMetaPageData))- (char*)metapage;
279+
268280
MarkBufferDirty(metabuffer);
269281
UnlockReleaseBuffer(metabuffer);
270282
}
@@ -534,6 +546,14 @@ SpGistInitMetapage(Page page)
534546
/* initialize last-used-page cache to empty */
535547
for (i=0;i<SPGIST_CACHED_PAGES;i++)
536548
metadata->lastUsedPages.cachedPage[i].blkno=InvalidBlockNumber;
549+
550+
/*
551+
* Set pd_lower just past the end of the metadata. This is essential,
552+
* because without doing so, metadata will be lost if xlog.c compresses
553+
* the page.
554+
*/
555+
((PageHeader)page)->pd_lower=
556+
((char*)metadata+sizeof(SpGistMetaPageData))- (char*)page;
537557
}
538558

539559
/*

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp