Skip to content

Commit 745dcbe

Browse files
alubennikovaalubennikova
committed
remove all ptrack_v1.1 related stuff
1 parent f28c2b3 commit 745dcbe

34 files changed

+14
-1156
lines changed

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include "access/reloptions.h"
2323
#include "access/relscan.h"
2424
#include "access/xloginsert.h"
25-
#include "access/ptrack.h"
2625
#include "catalog/index.h"
2726
#include "catalog/pg_am.h"
2827
#include "miscadmin.h"
@@ -686,7 +685,6 @@ brinbuildempty(Relation index)
686685
LockBuffer(metabuf, BUFFER_LOCK_EXCLUSIVE);
687686

688687
/* Initialize and xlog metabuffer. */
689-
ptrack_add_block(index, BufferGetBlockNumber(metabuf));
690688
START_CRIT_SECTION();
691689
brin_metapage_init(BufferGetPage(metabuf), BrinGetPagesPerRange(index),
692690
BRIN_CURRENT_VERSION);

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
#include "access/brin_revmap.h"
1616
#include "access/brin_xlog.h"
1717
#include "access/xloginsert.h"
18-
#include "access/ptrack.h"
1918
#include "miscadmin.h"
2019
#include "storage/bufmgr.h"
2120
#include "storage/freespace.h"
@@ -178,7 +177,6 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
178177
UnlockReleaseBuffer(newbuf);
179178
}
180179

181-
ptrack_add_block(idxrel, BufferGetBlockNumber(oldbuf));
182180
START_CRIT_SECTION();
183181
PageIndexDeleteNoCompact(oldpage, &oldoff, 1);
184182
if (PageAddItemExtended(oldpage, (Item) newtup, newsz, oldoff,
@@ -239,9 +237,6 @@ brin_doupdate(Relation idxrel, BlockNumber pagesPerRange,
239237

240238
revmapbuf = brinLockRevmapPageForUpdate(revmap, heapBlk);
241239

242-
ptrack_add_block(idxrel, BufferGetBlockNumber(newbuf));
243-
ptrack_add_block(idxrel, BufferGetBlockNumber(oldbuf));
244-
ptrack_add_block(idxrel, BufferGetBlockNumber(revmapbuf));
245240
START_CRIT_SECTION();
246241

247242
/*
@@ -413,8 +408,6 @@ brin_doinsert(Relation idxrel, BlockNumber pagesPerRange,
413408
blk = BufferGetBlockNumber(*buffer);
414409

415410
/* Execute the actual insertion */
416-
ptrack_add_block(idxrel, BufferGetBlockNumber(*buffer));
417-
ptrack_add_block(idxrel, BufferGetBlockNumber(revmapbuf));
418411
START_CRIT_SECTION();
419412
if (extended)
420413
brin_page_init(BufferGetPage(*buffer), BRIN_PAGETYPE_REGULAR);
@@ -869,7 +862,6 @@ brin_initialize_empty_new_buffer(Relation idxrel, Buffer buffer)
869862
"brin_initialize_empty_new_buffer: initializing blank page %u",
870863
BufferGetBlockNumber(buffer)));
871864

872-
ptrack_add_block(idxrel, BufferGetBlockNumber(buffer));
873865
START_CRIT_SECTION();
874866
page = BufferGetPage(buffer);
875867
brin_page_init(page, BRIN_PAGETYPE_REGULAR);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include "access/brin_xlog.h"
2828
#include "access/rmgr.h"
2929
#include "access/xloginsert.h"
30-
#include "access/ptrack.h"
3130
#include "miscadmin.h"
3231
#include "storage/bufmgr.h"
3332
#include "storage/lmgr.h"
@@ -476,8 +475,6 @@ revmap_physical_extend(BrinRevmap *revmap)
476475
* Ok, we have now locked the metapage and the target block. Re-initialize
477476
* it as a revmap page.
478477
*/
479-
ptrack_add_block(irel, BufferGetBlockNumber(buf));
480-
ptrack_add_block(irel, BufferGetBlockNumber(revmap->rm_metaBuf));
481478
START_CRIT_SECTION();
482479

483480
/* the rm_tids array is initialized to all invalid by PageInit */

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

Lines changed: 1 addition & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
#include "access/brin_pageops.h"
1515
#include "access/brin_xlog.h"
1616
#include "access/xlogutils.h"
17-
#include "access/ptrack.h"
1817

1918

2019
/*
@@ -27,11 +26,6 @@ brin_xlog_createidx(XLogReaderState *record)
2726
xl_brin_createidx *xlrec = (xl_brin_createidx *) XLogRecGetData(record);
2827
Buffer buf;
2928
Page page;
30-
RelFileNode rnode;
31-
BlockNumber blkno;
32-
33-
XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
34-
ptrack_add_block_redo(rnode, blkno);
3529

3630
/* create the index' metapage */
3731
buf = XLogInitBufferForRedo(record, 0);
@@ -56,13 +50,6 @@ brin_xlog_insert_update(XLogReaderState *record,
5650
BlockNumber regpgno;
5751
Page page;
5852
XLogRedoAction action;
59-
RelFileNode rnode;
60-
BlockNumber blkno;
61-
62-
XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
63-
ptrack_add_block_redo(rnode, blkno);
64-
XLogRecGetBlockTag(record, 1, &rnode, NULL, &blkno);
65-
ptrack_add_block_redo(rnode, blkno);
6653

6754
/*
6855
* If we inserted the first and only tuple on the page, re-initialize the
@@ -150,15 +137,9 @@ brin_xlog_update(XLogReaderState *record)
150137
xl_brin_update *xlrec = (xl_brin_update *) XLogRecGetData(record);
151138
Buffer buffer;
152139
XLogRedoAction action;
153-
RelFileNode rnode;
154-
BlockNumber blkno;
155-
156-
XLogRecGetBlockTag(record, 2, &rnode, NULL, &blkno);
157-
ptrack_add_block_redo(rnode, blkno);
158140

159141
/* First remove the old tuple */
160142
action = XLogReadBufferForRedo(record, 2, &buffer);
161-
162143
if (action == BLK_NEEDS_REDO)
163144
{
164145
Page page;
@@ -193,15 +174,9 @@ brin_xlog_samepage_update(XLogReaderState *record)
193174
xl_brin_samepage_update *xlrec;
194175
Buffer buffer;
195176
XLogRedoAction action;
196-
RelFileNode rnode;
197-
BlockNumber blkno;
198-
199-
XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
200-
ptrack_add_block_redo(rnode, blkno);
201177

202178
xlrec = (xl_brin_samepage_update *) XLogRecGetData(record);
203179
action = XLogReadBufferForRedo(record, 0, &buffer);
204-
205180
if (action == BLK_NEEDS_REDO)
206181
{
207182
Size tuplen;
@@ -245,21 +220,14 @@ brin_xlog_revmap_extend(XLogReaderState *record)
245220
Page page;
246221
BlockNumber targetBlk;
247222
XLogRedoAction action;
248-
RelFileNode rnode;
249-
BlockNumber blkno;
250223

251224
xlrec = (xl_brin_revmap_extend *) XLogRecGetData(record);
252225

253-
XLogRecGetBlockTag(record, 0, &rnode, NULL, &blkno);
254-
ptrack_add_block_redo(rnode, blkno);
255-
XLogRecGetBlockTag(record, 1, &rnode, NULL, &targetBlk);
256-
ptrack_add_block_redo(rnode, targetBlk);
257-
226+
XLogRecGetBlockTag(record, 1, NULL, NULL, &targetBlk);
258227
Assert(xlrec->targetBlk == targetBlk);
259228

260229
/* Update the metapage */
261230
action = XLogReadBufferForRedo(record, 0, &metabuf);
262-
263231
if (action == BLK_NEEDS_REDO)
264232
{
265233
Page metapg;

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

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "access/gin_private.h"
1818
#include "access/xloginsert.h"
19-
#include "access/ptrack.h"
2019
#include "miscadmin.h"
2120
#include "utils/memutils.h"
2221
#include "utils/rel.h"
@@ -386,9 +385,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
386385
else if (rc == GPTP_INSERT)
387386
{
388387
/* It will fit, perform the insertion */
389-
ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
390-
if (BufferIsValid(childbuf))
391-
ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
392388
START_CRIT_SECTION();
393389

394390
if (RelationNeedsWAL(btree->index) && !btree->isBuild)
@@ -538,12 +534,6 @@ ginPlaceToPage(GinBtree btree, GinBtreeStack *stack,
538534
* the new contents of the root.
539535
*/
540536

541-
ptrack_add_block(btree->index, BufferGetBlockNumber(rbuffer));
542-
ptrack_add_block(btree->index, BufferGetBlockNumber(stack->buffer));
543-
if (stack->parent == NULL)
544-
ptrack_add_block(btree->index, BufferGetBlockNumber(lbuffer));
545-
if (BufferIsValid(childbuf))
546-
ptrack_add_block(btree->index, BufferGetBlockNumber(childbuf));
547537
START_CRIT_SECTION();
548538

549539
MarkBufferDirty(rbuffer);

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "access/gin_private.h"
1818
#include "access/xloginsert.h"
19-
#include "access/ptrack.h"
2019
#include "lib/ilist.h"
2120
#include "miscadmin.h"
2221
#include "utils/rel.h"
@@ -836,7 +835,6 @@ ginVacuumPostingTreeLeaf(Relation indexrel, Buffer buffer, GinVacuumState *gvs)
836835
computeLeafRecompressWALData(leaf);
837836

838837
/* Apply changes to page */
839-
ptrack_add_block(indexrel, BufferGetBlockNumber(buffer));
840838
START_CRIT_SECTION();
841839

842840
dataPlaceToPageLeafRecompress(buffer, leaf);
@@ -1813,7 +1811,6 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems,
18131811
page = BufferGetPage(buffer);
18141812
blkno = BufferGetBlockNumber(buffer);
18151813

1816-
ptrack_add_block(index, BufferGetBlockNumber(buffer));
18171814
START_CRIT_SECTION();
18181815

18191816
PageRestoreTempPage(tmppage, page);

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
#include "access/gin_private.h"
2222
#include "access/xloginsert.h"
23-
#include "access/ptrack.h"
2423
#include "access/xlog.h"
2524
#include "commands/vacuum.h"
2625
#include "catalog/pg_am.h"
@@ -68,7 +67,6 @@ writeListPage(Relation index, Buffer buffer,
6867
/* workspace could be a local array; we use palloc for alignment */
6968
workspace = palloc(BLCKSZ);
7069

71-
ptrack_add_block(index, BufferGetBlockNumber(buffer));
7270
START_CRIT_SECTION();
7371

7472
GinInitBuffer(buffer, GIN_LIST);
@@ -295,7 +293,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
295293
/*
296294
* Main list is empty, so just insert sublist as main list
297295
*/
298-
ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
299296
START_CRIT_SECTION();
300297

301298
metadata->head = sublist.head;
@@ -319,8 +316,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
319316

320317
Assert(GinPageGetOpaque(page)->rightlink == InvalidBlockNumber);
321318

322-
ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
323-
ptrack_add_block(index, BufferGetBlockNumber(buffer));
324319
START_CRIT_SECTION();
325320

326321
GinPageGetOpaque(page)->rightlink = sublist.head;
@@ -363,8 +358,6 @@ ginHeapTupleFastInsert(GinState *ginstate, GinTupleCollector *collector)
363358
if (needWal)
364359
XLogBeginInsert();
365360

366-
ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
367-
ptrack_add_block(index, BufferGetBlockNumber(buffer));
368361
START_CRIT_SECTION();
369362

370363
/*
@@ -560,7 +553,6 @@ shiftList(Relation index, Buffer metabuffer, BlockNumber newHead,
560553
if (RelationNeedsWAL(index))
561554
XLogEnsureRecordSpace(data.ndeleted, 0);
562555

563-
ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
564556
START_CRIT_SECTION();
565557

566558
metadata->head = blknoToDelete;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "access/gin_private.h"
1818
#include "access/xloginsert.h"
1919
#include "access/generic_xlog.h"
20-
#include "access/ptrack.h"
2120
#include "catalog/index.h"
2221
#include "miscadmin.h"
2322
#include "storage/bufmgr.h"
@@ -338,8 +337,6 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
338337
/* initialize the root page */
339338
RootBuffer = GinNewBuffer(index);
340339

341-
ptrack_add_block(index, BufferGetBlockNumber(MetaBuffer));
342-
ptrack_add_block(index, BufferGetBlockNumber(RootBuffer));
343340
START_CRIT_SECTION();
344341
GinInitMetabuffer(MetaBuffer);
345342
MarkBufferDirty(MetaBuffer);
@@ -433,8 +430,6 @@ ginbuildempty(Relation index)
433430
LockBuffer(RootBuffer, BUFFER_LOCK_EXCLUSIVE);
434431

435432
/* Initialize and xlog metabuffer and root buffer. */
436-
ptrack_add_block(index, BufferGetBlockNumber(MetaBuffer));
437-
ptrack_add_block(index, BufferGetBlockNumber(RootBuffer));
438433
START_CRIT_SECTION();
439434
GinInitMetabuffer(MetaBuffer);
440435
MarkBufferDirty(MetaBuffer);

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
#include "access/gin_private.h"
1818
#include "access/reloptions.h"
1919
#include "access/xloginsert.h"
20-
#include "access/ptrack.h"
2120
#include "catalog/pg_collation.h"
2221
#include "catalog/pg_type.h"
2322
#include "miscadmin.h"
@@ -640,7 +639,6 @@ ginUpdateStats(Relation index, const GinStatsData *stats, bool is_build)
640639
metapage = BufferGetPage(metabuffer);
641640
metadata = GinPageGetMeta(metapage);
642641

643-
ptrack_add_block(index, BufferGetBlockNumber(metabuffer));
644642
START_CRIT_SECTION();
645643

646644
metadata->nTotalPages = stats->nTotalPages;

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
#include "access/gin_private.h"
1818
#include "access/xloginsert.h"
19-
#include "access/ptrack.h"
2019
#include "commands/vacuum.h"
2120
#include "miscadmin.h"
2221
#include "postmaster/autovacuum.h"
@@ -210,9 +209,6 @@ ginDeletePage(GinVacuumState *gvs, BlockNumber deleteBlkno, BlockNumber leftBlkn
210209
* LockBufferForCleanup() */
211210
LockBuffer(pBuffer, GIN_EXCLUSIVE);
212211

213-
ptrack_add_block(gvs->index, BufferGetBlockNumber(pBuffer));
214-
ptrack_add_block(gvs->index, BufferGetBlockNumber(lBuffer));
215-
ptrack_add_block(gvs->index, BufferGetBlockNumber(dBuffer));
216212
START_CRIT_SECTION();
217213

218214
/* Unlink the page by changing left sibling's rightlink */
@@ -607,7 +603,6 @@ ginbulkdelete(IndexVacuumInfo *info, IndexBulkDeleteResult *stats,
607603

608604
if (resPage)
609605
{
610-
ptrack_add_block(gvs.index, BufferGetBlockNumber(buffer));
611606
START_CRIT_SECTION();
612607
PageRestoreTempPage(resPage, page);
613608
MarkBufferDirty(buffer);

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy