Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit bb7cc26

Browse files
simonat2ndQuadrantsimonat2ndQuadrant
committed
Remove PageSetTLI and rename pd_tli to pd_checksum
Remove use of PageSetTLI() from all page manipulation functions and adjust README to indicate change in the way we make changes to pages. Repurpose those bytes into the pd_checksum field and explain how that works in comments about page header. Refactoring ahead of actual feature patch which would make use of the checksum field, arriving later. Jeff Davis, with comments and doc changes by Simon Riggs Direction suggested by Robert Haas; many others providing review comments.
1 parent 4c85575 commit bb7cc26

30 files changed

+30
-181
lines changed

‎contrib/pageinspect/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ MODULE_big = pageinspect
44
OBJS = rawpage.o heapfuncs.o btreefuncs.o fsmfuncs.o
55

66
EXTENSION = pageinspect
7-
DATA = pageinspect--1.0.sql pageinspect--unpackaged--1.0.sql
7+
DATA = pageinspect--1.0.sql pageinspect--unpackaged--1.0.sql \
8+
pageinspect--1.1.sql pageinspect--1.0--1.1.sql
89

910
ifdef USE_PGXS
1011
PG_CONFIG = pg_config

‎contrib/pageinspect/pageinspect.control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# pageinspect extension
22
comment = 'inspect the contents of database pages at a low level'
3-
default_version = '1.0'
3+
default_version = '1.1'
44
module_pathname = '$libdir/pageinspect'
55
relocatable = true

‎contrib/pageinspect/rawpage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ page_header(PG_FUNCTION_ARGS)
211211
(uint32) (lsn >> 32), (uint32) lsn);
212212

213213
values[0] = CStringGetTextDatum(lsnchar);
214-
values[1] = UInt16GetDatum(PageGetTLI(page));
214+
values[1] = UInt16GetDatum(page->pd_checksum);
215215
values[2] = UInt16GetDatum(page->pd_flags);
216216
values[3] = UInt16GetDatum(page->pd_lower);
217217
values[4] = UInt16GetDatum(page->pd_upper);

‎doc/src/sgml/pageinspect.sgml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,9 @@
6464
passed as argument. For example:
6565
<screen>
6666
test=# SELECT * FROM page_header(get_raw_page('pg_class', 0));
67-
lsn | tli | flags | lower | upper | special | pagesize | version | prune_xid
68-
-----------+-----+-------+-------+-------+---------+----------+---------+-----------
69-
0/24A1B50 | 1 | 1 | 232 | 368 | 8192 | 8192 | 4 | 0
67+
lsn | checksum | flags | lower | upper | special | pagesize | version | prune_xid
68+
-----------+----------+--------+-------+-------+---------+----------+---------+-----------
69+
0/24A1B50 | 1 | 1 | 232 | 368 | 8192 | 8192 | 4 | 0
7070
</screen>
7171
The returned columns correspond to the fields in the
7272
<structname>PageHeaderData</> struct.

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,6 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats)
308308

309309
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_INSERT, rdata);
310310
PageSetLSN(page, recptr);
311-
PageSetTLI(page, ThisTimeLineID);
312311
}
313312

314313
LockBuffer(stack->buffer, GIN_UNLOCK);
@@ -377,11 +376,8 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats)
377376

378377
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_SPLIT, rdata);
379378
PageSetLSN(page, recptr);
380-
PageSetTLI(page, ThisTimeLineID);
381379
PageSetLSN(lpage, recptr);
382-
PageSetTLI(lpage, ThisTimeLineID);
383380
PageSetLSN(rpage, recptr);
384-
PageSetTLI(rpage, ThisTimeLineID);
385381
}
386382

387383
UnlockReleaseBuffer(rbuffer);
@@ -426,9 +422,7 @@ ginInsertValue(GinBtree btree, GinBtreeStack *stack, GinStatsData *buildStats)
426422

427423
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_SPLIT, rdata);
428424
PageSetLSN(lpage, recptr);
429-
PageSetTLI(lpage, ThisTimeLineID);
430425
PageSetLSN(rpage, recptr);
431-
PageSetTLI(rpage, ThisTimeLineID);
432426
}
433427
UnlockReleaseBuffer(rbuffer);
434428
END_CRIT_SECTION();

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@ writeListPage(Relation index, Buffer buffer,
127127

128128
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_INSERT_LISTPAGE, rdata);
129129
PageSetLSN(page, recptr);
130-
PageSetTLI(page, ThisTimeLineID);
131130
}
132131

133132
/* get free space before releasing buffer */
@@ -408,12 +407,10 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
408407

409408
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE, rdata);
410409
PageSetLSN(metapage, recptr);
411-
PageSetTLI(metapage, ThisTimeLineID);
412410

413411
if (buffer != InvalidBuffer)
414412
{
415413
PageSetLSN(page, recptr);
416-
PageSetTLI(page, ThisTimeLineID);
417414
}
418415
}
419416

@@ -594,13 +591,11 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
594591

595592
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_LISTPAGE, rdata);
596593
PageSetLSN(metapage, recptr);
597-
PageSetTLI(metapage, ThisTimeLineID);
598594

599595
for (i = 0; i < data.ndeleted; i++)
600596
{
601597
page = BufferGetPage(buffers[i]);
602598
PageSetLSN(page, recptr);
603-
PageSetTLI(page, ThisTimeLineID);
604599
}
605600
}
606601

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,6 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems)
8484

8585
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_CREATE_PTREE, rdata);
8686
PageSetLSN(page, recptr);
87-
PageSetTLI(page, ThisTimeLineID);
8887
}
8988

9089
UnlockReleaseBuffer(buffer);
@@ -431,11 +430,9 @@ ginbuild(PG_FUNCTION_ARGS)
431430

432431
page = BufferGetPage(RootBuffer);
433432
PageSetLSN(page, recptr);
434-
PageSetTLI(page, ThisTimeLineID);
435433

436434
page = BufferGetPage(MetaBuffer);
437435
PageSetLSN(page, recptr);
438-
PageSetTLI(page, ThisTimeLineID);
439436
}
440437

441438
UnlockReleaseBuffer(MetaBuffer);

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,6 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
593593

594594
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_UPDATE_META_PAGE, &rdata);
595595
PageSetLSN(metapage, recptr);
596-
PageSetTLI(metapage, ThisTimeLineID);
597596
}
598597

599598
UnlockReleaseBuffer(metabuffer);

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,6 @@ xlogVacuumPage(Relation index, Buffer buffer)
147147

148148
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_VACUUM_PAGE, rdata);
149149
PageSetLSN(page, recptr);
150-
PageSetTLI(page, ThisTimeLineID);
151150
}
152151

153152
static bool
@@ -350,14 +349,11 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
350349

351350
recptr = XLogInsert(RM_GIN_ID, XLOG_GIN_DELETE_PAGE, rdata);
352351
PageSetLSN(page, recptr);
353-
PageSetTLI(page, ThisTimeLineID);
354352
PageSetLSN(parentPage, recptr);
355-
PageSetTLI(parentPage, ThisTimeLineID);
356353
if (leftBlkno != InvalidBlockNumber)
357354
{
358355
page = BufferGetPage(lBuffer);
359356
PageSetLSN(page, recptr);
360-
PageSetTLI(page, ThisTimeLineID);
361357
}
362358
}
363359

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

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ ginRedoCreateIndex(XLogRecPtr lsn, XLogRecord *record)
8787
GinInitMetabuffer(MetaBuffer);
8888

8989
PageSetLSN(page, lsn);
90-
PageSetTLI(page, ThisTimeLineID);
9190
MarkBufferDirty(MetaBuffer);
9291

9392
RootBuffer = XLogReadBuffer(*node, GIN_ROOT_BLKNO, true);
@@ -97,7 +96,6 @@ ginRedoCreateIndex(XLogRecPtr lsn, XLogRecord *record)
9796
GinInitBuffer(RootBuffer, GIN_LEAF);
9897

9998
PageSetLSN(page, lsn);
100-
PageSetTLI(page, ThisTimeLineID);
10199
MarkBufferDirty(RootBuffer);
102100

103101
UnlockReleaseBuffer(RootBuffer);
@@ -124,7 +122,6 @@ ginRedoCreatePTree(XLogRecPtr lsn, XLogRecord *record)
124122
GinPageGetOpaque(page)->maxoff = data->nitem;
125123

126124
PageSetLSN(page, lsn);
127-
PageSetTLI(page, ThisTimeLineID);
128125

129126
MarkBufferDirty(buffer);
130127
UnlockReleaseBuffer(buffer);
@@ -242,7 +239,6 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
242239
}
243240

244241
PageSetLSN(page, lsn);
245-
PageSetTLI(page, ThisTimeLineID);
246242

247243
MarkBufferDirty(buffer);
248244
}
@@ -333,11 +329,9 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
333329
}
334330

335331
PageSetLSN(rpage, lsn);
336-
PageSetTLI(rpage, ThisTimeLineID);
337332
MarkBufferDirty(rbuffer);
338333

339334
PageSetLSN(lpage, lsn);
340-
PageSetTLI(lpage, ThisTimeLineID);
341335
MarkBufferDirty(lbuffer);
342336

343337
if (!data->isLeaf && data->updateBlkno != InvalidBlockNumber)
@@ -362,7 +356,6 @@ ginRedoSplit(XLogRecPtr lsn, XLogRecord *record)
362356
}
363357

364358
PageSetLSN(rootPage, lsn);
365-
PageSetTLI(rootPage, ThisTimeLineID);
366359

367360
MarkBufferDirty(rootBuf);
368361
UnlockReleaseBuffer(rootBuf);
@@ -424,7 +417,6 @@ ginRedoVacuumPage(XLogRecPtr lsn, XLogRecord *record)
424417
}
425418

426419
PageSetLSN(page, lsn);
427-
PageSetTLI(page, ThisTimeLineID);
428420
MarkBufferDirty(buffer);
429421
}
430422

@@ -453,7 +445,6 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
453445
Assert(GinPageIsData(page));
454446
GinPageGetOpaque(page)->flags = GIN_DELETED;
455447
PageSetLSN(page, lsn);
456-
PageSetTLI(page, ThisTimeLineID);
457448
MarkBufferDirty(dbuffer);
458449
}
459450
}
@@ -473,7 +464,6 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
473464
Assert(!GinPageIsLeaf(page));
474465
GinPageDeletePostingItem(page, data->parentOffset);
475466
PageSetLSN(page, lsn);
476-
PageSetTLI(page, ThisTimeLineID);
477467
MarkBufferDirty(pbuffer);
478468
}
479469
}
@@ -492,7 +482,6 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
492482
Assert(GinPageIsData(page));
493483
GinPageGetOpaque(page)->rightlink = data->rightLink;
494484
PageSetLSN(page, lsn);
495-
PageSetTLI(page, ThisTimeLineID);
496485
MarkBufferDirty(lbuffer);
497486
}
498487
UnlockReleaseBuffer(lbuffer);
@@ -522,7 +511,6 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
522511
{
523512
memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
524513
PageSetLSN(metapage, lsn);
525-
PageSetTLI(metapage, ThisTimeLineID);
526514
MarkBufferDirty(metabuffer);
527515
}
528516

@@ -569,7 +557,6 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
569557
GinPageGetOpaque(page)->maxoff++;
570558

571559
PageSetLSN(page, lsn);
572-
PageSetTLI(page, ThisTimeLineID);
573560
MarkBufferDirty(buffer);
574561
}
575562
UnlockReleaseBuffer(buffer);
@@ -595,7 +582,6 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
595582
GinPageGetOpaque(page)->rightlink = data->newRightlink;
596583

597584
PageSetLSN(page, lsn);
598-
PageSetTLI(page, ThisTimeLineID);
599585
MarkBufferDirty(buffer);
600586
}
601587
UnlockReleaseBuffer(buffer);
@@ -655,7 +641,6 @@ ginRedoInsertListPage(XLogRecPtr lsn, XLogRecord *record)
655641
}
656642

657643
PageSetLSN(page, lsn);
658-
PageSetTLI(page, ThisTimeLineID);
659644
MarkBufferDirty(buffer);
660645

661646
UnlockReleaseBuffer(buffer);
@@ -681,7 +666,6 @@ ginRedoDeleteListPages(XLogRecPtr lsn, XLogRecord *record)
681666
{
682667
memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
683668
PageSetLSN(metapage, lsn);
684-
PageSetTLI(metapage, ThisTimeLineID);
685669
MarkBufferDirty(metabuffer);
686670
}
687671

@@ -708,7 +692,6 @@ ginRedoDeleteListPages(XLogRecPtr lsn, XLogRecord *record)
708692
GinPageGetOpaque(page)->flags = GIN_DELETED;
709693

710694
PageSetLSN(page, lsn);
711-
PageSetTLI(page, ThisTimeLineID);
712695
MarkBufferDirty(buffer);
713696
}
714697

‎src/backend/access/gist/gist.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
410410
for (ptr = dist; ptr; ptr = ptr->next)
411411
{
412412
PageSetLSN(ptr->page, recptr);
413-
PageSetTLI(ptr->page, ThisTimeLineID);
414413
}
415414

416415
/*
@@ -458,7 +457,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
458457
leftchildbuf);
459458

460459
PageSetLSN(page, recptr);
461-
PageSetTLI(page, ThisTimeLineID);
462460
}
463461
else
464462
{
@@ -491,7 +489,6 @@ gistplacetopage(Relation rel, Size freespace, GISTSTATE *giststate,
491489
GistClearFollowRight(leftpg);
492490

493491
PageSetLSN(leftpg, recptr);
494-
PageSetTLI(leftpg, ThisTimeLineID);
495492
}
496493

497494
END_CRIT_SECTION();

‎src/backend/access/gist/gistbuild.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ gistbuild(PG_FUNCTION_ARGS)
191191

192192
recptr = XLogInsert(RM_GIST_ID, XLOG_GIST_CREATE_INDEX, &rdata);
193193
PageSetLSN(page, recptr);
194-
PageSetTLI(page, ThisTimeLineID);
195194
}
196195
else
197196
PageSetLSN(page, gistGetFakeLSN(heap));

‎src/backend/access/gist/gistvacuum.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,6 @@ gistbulkdelete(PG_FUNCTION_ARGS)
235235
todelete, ntodelete,
236236
NULL, 0, InvalidBuffer);
237237
PageSetLSN(page, recptr);
238-
PageSetTLI(page, ThisTimeLineID);
239238
}
240239
else
241240
PageSetLSN(page, gistGetFakeLSN(rel));

‎src/backend/access/gist/gistxlog.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ gistRedoClearFollowRight(XLogRecPtr lsn, XLogRecord *record, int block_index,
7070
GistClearFollowRight(page);
7171

7272
PageSetLSN(page, lsn);
73-
PageSetTLI(page, ThisTimeLineID);
7473
MarkBufferDirty(buffer);
7574
}
7675
UnlockReleaseBuffer(buffer);
@@ -185,7 +184,6 @@ gistRedoPageUpdateRecord(XLogRecPtr lsn, XLogRecord *record)
185184

186185
GistPageGetOpaque(page)->rightlink = InvalidBlockNumber;
187186
PageSetLSN(page, lsn);
188-
PageSetTLI(page, ThisTimeLineID);
189187
MarkBufferDirty(buffer);
190188
UnlockReleaseBuffer(buffer);
191189
}
@@ -289,7 +287,6 @@ gistRedoPageSplitRecord(XLogRecPtr lsn, XLogRecord *record)
289287
}
290288

291289
PageSetLSN(page, lsn);
292-
PageSetTLI(page, ThisTimeLineID);
293290
MarkBufferDirty(buffer);
294291

295292
if (i == 0)
@@ -324,7 +321,6 @@ gistRedoCreateIndex(XLogRecPtr lsn, XLogRecord *record)
324321
GISTInitBuffer(buffer, F_LEAF);
325322

326323
PageSetLSN(page, lsn);
327-
PageSetTLI(page, ThisTimeLineID);
328324

329325
MarkBufferDirty(buffer);
330326
UnlockReleaseBuffer(buffer);

0 commit comments

Comments
 (0)