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

Commit 5ab3af4

Browse files
alvherrealvherre
committed
Remove obsolete XLogRecPtr macros
This gets rid of XLByteLT, XLByteLE, XLByteEQ and XLByteAdvance. These were useful for brevity when XLogRecPtrs were split in xlogid/xrecoff; but now that they are simple uint64's, they are just clutter. The only downside to making this change would be ease of backporting patches, but that has been negated by other substantive changes to the involved code anyway. The clarity of simpler expressions makes the change worthwhile. Most of the changes are mechanical, but in a couple of places, the patch author chose to invert the operator sense, making the code flow more logical (and more in line with preceding comments). Author: Andres Freund Eyeballed by Dimitri Fontaine and Alvaro Herrera
1 parent 24eca79 commit 5ab3af4

File tree

20 files changed

+163
-177
lines changed

20 files changed

+163
-177
lines changed

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ ginRedoInsert(XLogRecPtr lsn, XLogRecord *record)
177177
return; /* page was deleted, nothing to do */
178178
page = (Page) BufferGetPage(buffer);
179179

180-
if (!XLByteLE(lsn, PageGetLSN(page)))
180+
if (lsn > PageGetLSN(page))
181181
{
182182
if (data->isData)
183183
{
@@ -393,7 +393,7 @@ ginRedoVacuumPage(XLogRecPtr lsn, XLogRecord *record)
393393
return;
394394
page = (Page) BufferGetPage(buffer);
395395

396-
if (!XLByteLE(lsn, PageGetLSN(page)))
396+
if (lsn > PageGetLSN(page))
397397
{
398398
if (GinPageIsData(page))
399399
{
@@ -448,7 +448,7 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
448448
if (BufferIsValid(dbuffer))
449449
{
450450
page = BufferGetPage(dbuffer);
451-
if (!XLByteLE(lsn, PageGetLSN(page)))
451+
if (lsn > PageGetLSN(page))
452452
{
453453
Assert(GinPageIsData(page));
454454
GinPageGetOpaque(page)->flags = GIN_DELETED;
@@ -467,7 +467,7 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
467467
if (BufferIsValid(pbuffer))
468468
{
469469
page = BufferGetPage(pbuffer);
470-
if (!XLByteLE(lsn, PageGetLSN(page)))
470+
if (lsn > PageGetLSN(page))
471471
{
472472
Assert(GinPageIsData(page));
473473
Assert(!GinPageIsLeaf(page));
@@ -487,7 +487,7 @@ ginRedoDeletePage(XLogRecPtr lsn, XLogRecord *record)
487487
if (BufferIsValid(lbuffer))
488488
{
489489
page = BufferGetPage(lbuffer);
490-
if (!XLByteLE(lsn, PageGetLSN(page)))
490+
if (lsn > PageGetLSN(page))
491491
{
492492
Assert(GinPageIsData(page));
493493
GinPageGetOpaque(page)->rightlink = data->rightLink;
@@ -518,7 +518,7 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
518518
return; /* assume index was deleted, nothing to do */
519519
metapage = BufferGetPage(metabuffer);
520520

521-
if (!XLByteLE(lsn, PageGetLSN(metapage)))
521+
if (lsn > PageGetLSN(metapage))
522522
{
523523
memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
524524
PageSetLSN(metapage, lsn);
@@ -540,7 +540,7 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
540540
{
541541
Page page = BufferGetPage(buffer);
542542

543-
if (!XLByteLE(lsn, PageGetLSN(page)))
543+
if (lsn > PageGetLSN(page))
544544
{
545545
OffsetNumber l,
546546
off = (PageIsEmpty(page)) ? FirstOffsetNumber :
@@ -590,7 +590,7 @@ ginRedoUpdateMetapage(XLogRecPtr lsn, XLogRecord *record)
590590
{
591591
Page page = BufferGetPage(buffer);
592592

593-
if (!XLByteLE(lsn, PageGetLSN(page)))
593+
if (lsn > PageGetLSN(page))
594594
{
595595
GinPageGetOpaque(page)->rightlink = data->newRightlink;
596596

@@ -677,7 +677,7 @@ ginRedoDeleteListPages(XLogRecPtr lsn, XLogRecord *record)
677677
return; /* assume index was deleted, nothing to do */
678678
metapage = BufferGetPage(metabuffer);
679679

680-
if (!XLByteLE(lsn, PageGetLSN(metapage)))
680+
if (lsn > PageGetLSN(metapage))
681681
{
682682
memcpy(GinPageGetMeta(metapage), &data->metadata, sizeof(GinMetaPageData));
683683
PageSetLSN(metapage, lsn);
@@ -703,7 +703,7 @@ ginRedoDeleteListPages(XLogRecPtr lsn, XLogRecord *record)
703703
{
704704
Page page = BufferGetPage(buffer);
705705

706-
if (!XLByteLE(lsn, PageGetLSN(page)))
706+
if (lsn > PageGetLSN(page))
707707
{
708708
GinPageGetOpaque(page)->flags = GIN_DELETED;
709709

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -561,8 +561,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
561561
}
562562

563563
if (stack->blkno != GIST_ROOT_BLKNO &&
564-
XLByteLT(stack->parent->lsn,
565-
GistPageGetOpaque(stack->page)->nsn))
564+
stack->parent->lsn < GistPageGetOpaque(stack->page)->nsn)
566565
{
567566
/*
568567
* Concurrent split detected. There's no guarantee that the
@@ -620,7 +619,7 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
620619
xlocked = true;
621620
stack->page = (Page) BufferGetPage(stack->buffer);
622621

623-
if (!XLByteEQ(PageGetLSN(stack->page), stack->lsn))
622+
if (PageGetLSN(stack->page) != stack->lsn)
624623
{
625624
/* the page was changed while we unlocked it, retry */
626625
continue;
@@ -708,8 +707,8 @@ gistdoinsert(Relation r, IndexTuple itup, Size freespace, GISTSTATE *giststate)
708707
*/
709708
}
710709
else if (GistFollowRight(stack->page) ||
711-
XLByteLT(stack->parent->lsn,
712-
GistPageGetOpaque(stack->page)->nsn))
710+
stack->parent->lsn <
711+
GistPageGetOpaque(stack->page)->nsn)
713712
{
714713
/*
715714
* The page was split while we momentarily unlocked the
@@ -794,7 +793,7 @@ gistFindPath(Relation r, BlockNumber child, OffsetNumber *downlinkoffnum)
794793
if (GistFollowRight(page))
795794
elog(ERROR, "concurrent GiST page split was incomplete");
796795

797-
if (top->parent && XLByteLT(top->parent->lsn, GistPageGetOpaque(page)->nsn) &&
796+
if (top->parent && top->parent->lsn < GistPageGetOpaque(page)->nsn &&
798797
GistPageGetOpaque(page)->rightlink != InvalidBlockNumber /* sanity check */ )
799798
{
800799
/*
@@ -864,7 +863,8 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child)
864863
parent->page = (Page) BufferGetPage(parent->buffer);
865864

866865
/* here we don't need to distinguish between split and page update */
867-
if (child->downlinkoffnum == InvalidOffsetNumber || !XLByteEQ(parent->lsn, PageGetLSN(parent->page)))
866+
if (child->downlinkoffnum == InvalidOffsetNumber ||
867+
parent->lsn != PageGetLSN(parent->page))
868868
{
869869
/* parent is changed, look child in right links until found */
870870
OffsetNumber i,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ gistScanPage(IndexScanDesc scan, GISTSearchItem *pageItem, double *myDistances,
263263
*/
264264
if (!XLogRecPtrIsInvalid(pageItem->data.parentlsn) &&
265265
(GistFollowRight(page) ||
266-
XLByteLT(pageItem->data.parentlsn, opaque->nsn)) &&
266+
pageItem->data.parentlsn < opaque->nsn) &&
267267
opaque->rightlink != InvalidBlockNumber /* sanity check */ )
268268
{
269269
/* There was a page split, follow right link to add pages */

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ pushStackIfSplited(Page page, GistBDItem *stack)
114114
GISTPageOpaque opaque = GistPageGetOpaque(page);
115115

116116
if (stack->blkno != GIST_ROOT_BLKNO && !XLogRecPtrIsInvalid(stack->parentlsn) &&
117-
(GistFollowRight(page) || XLByteLT(stack->parentlsn, opaque->nsn)) &&
117+
(GistFollowRight(page) || stack->parentlsn < opaque->nsn) &&
118118
opaque->rightlink != InvalidBlockNumber /* sanity check */ )
119119
{
120120
/* split page detected, install right link to the stack */

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ gistRedoClearFollowRight(XLogRecPtr lsn, XLogRecord *record, int block_index,
6464
* of this record, because the updated NSN is not included in the full
6565
* page image.
6666
*/
67-
if (!XLByteLT(lsn, PageGetLSN(page)))
67+
if (lsn >= PageGetLSN(page))
6868
{
6969
GistPageGetOpaque(page)->nsn = lsn;
7070
GistClearFollowRight(page);
@@ -119,7 +119,7 @@ gistRedoPageUpdateRecord(XLogRecPtr lsn, XLogRecord *record)
119119
page = (Page) BufferGetPage(buffer);
120120

121121
/* nothing more to do if change already applied */
122-
if (XLByteLE(lsn, PageGetLSN(page)))
122+
if (lsn <= PageGetLSN(page))
123123
{
124124
UnlockReleaseBuffer(buffer);
125125
return;

‎src/backend/access/heap/heapam.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4700,7 +4700,7 @@ heap_xlog_clean(XLogRecPtr lsn, XLogRecord *record)
47004700
LockBufferForCleanup(buffer);
47014701
page = (Page) BufferGetPage(buffer);
47024702

4703-
if (XLByteLE(lsn, PageGetLSN(page)))
4703+
if (lsn <= PageGetLSN(page))
47044704
{
47054705
UnlockReleaseBuffer(buffer);
47064706
return;
@@ -4770,7 +4770,7 @@ heap_xlog_freeze(XLogRecPtr lsn, XLogRecord *record)
47704770
return;
47714771
page = (Page) BufferGetPage(buffer);
47724772

4773-
if (XLByteLE(lsn, PageGetLSN(page)))
4773+
if (lsn <= PageGetLSN(page))
47744774
{
47754775
UnlockReleaseBuffer(buffer);
47764776
return;
@@ -4854,7 +4854,7 @@ heap_xlog_visible(XLogRecPtr lsn, XLogRecord *record)
48544854
* XLOG record's LSN, we mustn't mark the page all-visible, because
48554855
* the subsequent update won't be replayed to clear the flag.
48564856
*/
4857-
if (!XLByteLE(lsn, PageGetLSN(page)))
4857+
if (lsn > PageGetLSN(page))
48584858
{
48594859
PageSetAllVisible(page);
48604860
MarkBufferDirty(buffer);
@@ -4891,7 +4891,7 @@ heap_xlog_visible(XLogRecPtr lsn, XLogRecord *record)
48914891
* we did for the heap page. If this results in a dropped bit, no
48924892
* real harm is done; and the next VACUUM will fix it.
48934893
*/
4894-
if (!XLByteLE(lsn, PageGetLSN(BufferGetPage(vmbuffer))))
4894+
if (lsn > PageGetLSN(BufferGetPage(vmbuffer)))
48954895
visibilitymap_set(reln, xlrec->block, lsn, vmbuffer,
48964896
xlrec->cutoff_xid);
48974897

@@ -4977,7 +4977,7 @@ heap_xlog_delete(XLogRecPtr lsn, XLogRecord *record)
49774977
return;
49784978
page = (Page) BufferGetPage(buffer);
49794979

4980-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
4980+
if (lsn <= PageGetLSN(page)) /* changes are applied */
49814981
{
49824982
UnlockReleaseBuffer(buffer);
49834983
return;
@@ -5072,7 +5072,7 @@ heap_xlog_insert(XLogRecPtr lsn, XLogRecord *record)
50725072
return;
50735073
page = (Page) BufferGetPage(buffer);
50745074

5075-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5075+
if (lsn <= PageGetLSN(page)) /* changes are applied */
50765076
{
50775077
UnlockReleaseBuffer(buffer);
50785078
return;
@@ -5207,7 +5207,7 @@ heap_xlog_multi_insert(XLogRecPtr lsn, XLogRecord *record)
52075207
return;
52085208
page = (Page) BufferGetPage(buffer);
52095209

5210-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5210+
if (lsn <= PageGetLSN(page)) /* changes are applied */
52115211
{
52125212
UnlockReleaseBuffer(buffer);
52135213
return;
@@ -5349,7 +5349,7 @@ heap_xlog_update(XLogRecPtr lsn, XLogRecord *record, bool hot_update)
53495349
goto newt;
53505350
page = (Page) BufferGetPage(obuffer);
53515351

5352-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5352+
if (lsn <= PageGetLSN(page)) /* changes are applied */
53535353
{
53545354
if (samepage)
53555355
{
@@ -5449,7 +5449,7 @@ newt:;
54495449
return;
54505450
page = (Page) BufferGetPage(nbuffer);
54515451

5452-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5452+
if (lsn <= PageGetLSN(page)) /* changes are applied */
54535453
{
54545454
UnlockReleaseBuffer(nbuffer);
54555455
if (BufferIsValid(obuffer))
@@ -5549,7 +5549,7 @@ heap_xlog_lock(XLogRecPtr lsn, XLogRecord *record)
55495549
return;
55505550
page = (Page) BufferGetPage(buffer);
55515551

5552-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5552+
if (lsn <= PageGetLSN(page)) /* changes are applied */
55535553
{
55545554
UnlockReleaseBuffer(buffer);
55555555
return;
@@ -5612,7 +5612,7 @@ heap_xlog_inplace(XLogRecPtr lsn, XLogRecord *record)
56125612
return;
56135613
page = (Page) BufferGetPage(buffer);
56145614

5615-
if (XLByteLE(lsn, PageGetLSN(page))) /* changes are applied */
5615+
if (lsn <= PageGetLSN(page)) /* changes are applied */
56165616
{
56175617
UnlockReleaseBuffer(buffer);
56185618
return;

‎src/backend/access/nbtree/nbtxlog.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ btree_xlog_insert(bool isleaf, bool ismeta,
229229
{
230230
page = (Page) BufferGetPage(buffer);
231231

232-
if (XLByteLE(lsn, PageGetLSN(page)))
232+
if (lsn <= PageGetLSN(page))
233233
{
234234
UnlockReleaseBuffer(buffer);
235235
}
@@ -381,7 +381,7 @@ btree_xlog_split(bool onleft, bool isroot,
381381
Page lpage = (Page) BufferGetPage(lbuf);
382382
BTPageOpaque lopaque = (BTPageOpaque) PageGetSpecialPointer(lpage);
383383

384-
if (!XLByteLE(lsn, PageGetLSN(lpage)))
384+
if (lsn > PageGetLSN(lpage))
385385
{
386386
OffsetNumber off;
387387
OffsetNumber maxoff = PageGetMaxOffsetNumber(lpage);
@@ -459,7 +459,7 @@ btree_xlog_split(bool onleft, bool isroot,
459459
{
460460
Page page = (Page) BufferGetPage(buffer);
461461

462-
if (!XLByteLE(lsn, PageGetLSN(page)))
462+
if (lsn > PageGetLSN(page))
463463
{
464464
BTPageOpaque pageop = (BTPageOpaque) PageGetSpecialPointer(page);
465465

@@ -537,7 +537,7 @@ btree_xlog_vacuum(XLogRecPtr lsn, XLogRecord *record)
537537
LockBufferForCleanup(buffer);
538538
page = (Page) BufferGetPage(buffer);
539539

540-
if (XLByteLE(lsn, PageGetLSN(page)))
540+
if (lsn <= PageGetLSN(page))
541541
{
542542
UnlockReleaseBuffer(buffer);
543543
return;
@@ -757,7 +757,7 @@ btree_xlog_delete(XLogRecPtr lsn, XLogRecord *record)
757757
return;
758758
page = (Page) BufferGetPage(buffer);
759759

760-
if (XLByteLE(lsn, PageGetLSN(page)))
760+
if (lsn <= PageGetLSN(page))
761761
{
762762
UnlockReleaseBuffer(buffer);
763763
return;
@@ -820,7 +820,7 @@ btree_xlog_delete_page(uint8 info, XLogRecPtr lsn, XLogRecord *record)
820820
{
821821
page = (Page) BufferGetPage(buffer);
822822
pageop = (BTPageOpaque) PageGetSpecialPointer(page);
823-
if (XLByteLE(lsn, PageGetLSN(page)))
823+
if (lsn <= PageGetLSN(page))
824824
{
825825
UnlockReleaseBuffer(buffer);
826826
}
@@ -867,7 +867,7 @@ btree_xlog_delete_page(uint8 info, XLogRecPtr lsn, XLogRecord *record)
867867
if (BufferIsValid(buffer))
868868
{
869869
page = (Page) BufferGetPage(buffer);
870-
if (XLByteLE(lsn, PageGetLSN(page)))
870+
if (lsn <= PageGetLSN(page))
871871
{
872872
UnlockReleaseBuffer(buffer);
873873
}
@@ -895,7 +895,7 @@ btree_xlog_delete_page(uint8 info, XLogRecPtr lsn, XLogRecord *record)
895895
if (BufferIsValid(buffer))
896896
{
897897
page = (Page) BufferGetPage(buffer);
898-
if (XLByteLE(lsn, PageGetLSN(page)))
898+
if (lsn <= PageGetLSN(page))
899899
{
900900
UnlockReleaseBuffer(buffer);
901901
}

0 commit comments

Comments
 (0)