Skip to content

Commit 72a178a

Browse files
author
Artur Zakirov
committed
Clean item pointer initialization
1 parent 394795f commit 72a178a

File tree

5 files changed

+12
-32
lines changed

5 files changed

+12
-32
lines changed

‎rum.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,8 @@ typedef struct RumOptions
306306
typedef struct RumKey
307307
{
308308
ItemPointerData iptr;
309-
bool addInfoIsNull;
310309
Datum addInfo;
310+
bool addInfoIsNull;
311311
} RumKey;
312312

313313
#define RumItemSetMin(item) \

‎rumdatapage.c

Lines changed: 6 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -484,9 +484,7 @@ findInLeafPage(RumBtree btree, Page page, OffsetNumber *offset,
484484
RumKey item;
485485
int cmp;
486486

487-
item.iptr.ip_blkid.bi_lo = 0;
488-
item.iptr.ip_blkid.bi_hi = 0;
489-
item.iptr.ip_posid = 0;
487+
ItemPointerSetMin(&item.iptr);
490488
maxoff = RumPageGetOpaque(page)->maxoff;
491489

492490
/*
@@ -880,9 +878,7 @@ dataPlaceToPage(RumBtree btree, Page page, OffsetNumber off)
880878
totalsize / 2 && page == newlPage) \
881879
{ \
882880
maxLeftIptr = item.iptr; \
883-
prevIptr.ip_blkid.bi_hi = 0; \
884-
prevIptr.ip_blkid.bi_lo = 0; \
885-
prevIptr.ip_posid = 0; \
881+
ItemPointerSetMin(&prevIptr); \
886882
RumPageGetOpaque(newlPage)->maxoff = j; \
887883
page = rPage; \
888884
ptr = RumDataPageGetData(rPage); \
@@ -937,9 +933,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
937933

938934
/* Calculate the whole size we're going to place */
939935
copyPtr = RumDataPageGetData(lpageCopy);
940-
item.iptr.ip_blkid.bi_lo = 0;
941-
item.iptr.ip_blkid.bi_hi = 0;
942-
item.iptr.ip_posid = 0;
936+
ItemPointerSetMin(&item.iptr);
943937
for (i = FirstOffsetNumber; i <= maxoff; i++)
944938
{
945939
if (i == off)
@@ -1015,9 +1009,7 @@ dataSplitPageLeaf(RumBtree btree, Buffer lbuf, Buffer rbuf,
10151009
page = newlPage;
10161010
j = FirstOffsetNumber;
10171011

1018-
item.iptr.ip_blkid.bi_lo = 0;
1019-
item.iptr.ip_blkid.bi_hi = 0;
1020-
item.iptr.ip_posid = 0;
1012+
ItemPointerSetMin(&item.iptr);
10211013
prevIptr = item.iptr;
10221014
copyPtr = RumDataPageGetData(lpageCopy);
10231015
for (i = FirstOffsetNumber; i <= maxoff; i++)
@@ -1223,9 +1215,7 @@ updateItemIndexes(Page page, OffsetNumber attnum, RumState *rumstate)
12231215

12241216
maxoff = RumPageGetOpaque(page)->maxoff;
12251217
ptr = RumDataPageGetData(page);
1226-
item.iptr.ip_blkid.bi_lo = 0;
1227-
item.iptr.ip_blkid.bi_hi = 0;
1228-
item.iptr.ip_posid = 0;
1218+
ItemPointerSetMin(&item.iptr);
12291219

12301220
for (i = FirstOffsetNumber; i <= maxoff; i++)
12311221
{
@@ -1271,9 +1261,7 @@ checkLeafDataPage(RumState *rumstate, AttrNumber attnum, Page page)
12711261

12721262
maxoff = RumPageGetOpaque(page)->maxoff;
12731263
ptr = RumDataPageGetData(page);
1274-
item.iptr.ip_blkid.bi_lo = 0;
1275-
item.iptr.ip_blkid.bi_hi = 0;
1276-
item.iptr.ip_posid = 0;
1264+
ItemPointerSetMin(&item.iptr);
12771265

12781266
Assert(RumPageGetOpaque(page)->flags & RUM_LEAF);
12791267

‎rumentrypage.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,10 +49,7 @@ rumReadTuplePointers(RumState *rumstate, OffsetNumber attnum,
4949
i;
5050
RumKey item;
5151

52-
item.iptr.ip_blkid.bi_lo = 0;
53-
item.iptr.ip_blkid.bi_hi = 0;
54-
item.iptr.ip_posid = 0;
55-
52+
ItemPointerSetMin(&item.iptr);
5653
for (i = 0; i < nipd; i++)
5754
{
5855
ptr = rumDataPageLeafRead(ptr, attnum, &item, rumstate, false);

‎rumget.c

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -118,9 +118,7 @@ findItemInPostingPage(Page page, ItemPointer item, OffsetNumber *off,
118118
Pointer ptr;
119119
RumKey iter_item;
120120

121-
iter_item.iptr.ip_blkid.bi_lo = 0;
122-
iter_item.iptr.ip_blkid.bi_hi = 0;
123-
iter_item.iptr.ip_posid = 0;
121+
ItemPointerSetMin(&iter_item.iptr);
124122

125123
if (RumPageGetOpaque(page)->flags & RUM_DELETED)
126124
/* page was deleted by concurrent vacuum */
@@ -203,9 +201,7 @@ scanPostingTree(Relation index, RumScanEntry scanEntry,
203201
RumKey item;
204202
Pointer ptr;
205203

206-
item.iptr.ip_blkid.bi_lo = 0;
207-
item.iptr.ip_blkid.bi_hi = 0;
208-
item.iptr.ip_posid = 0;
204+
ItemPointerSetMin(&item.iptr);
209205

210206
ptr = RumDataPageGetData(page);
211207
for (i = FirstOffsetNumber; i <= maxoff; i++)

‎rumvacuum.c

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,8 @@ rumVacuumPostingList(RumVacuumState *gvs, OffsetNumber attnum, Pointer src,
4949
ItemPointerData prevIptr;
5050
Pointer dst = NULL, prev, ptr = src;
5151

52-
item.iptr.ip_blkid.bi_lo = 0;
53-
item.iptr.ip_blkid.bi_hi = 0;
54-
item.iptr.ip_posid = 0;
52+
ItemPointerSetMin(&item.iptr);
53+
5554
/*
5655
* just scan over ItemPointer array
5756
*/

0 commit comments

Comments
 (0)