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

Commit43d9de1

Browse files
committed
remove all ptrack_v1.1 related stuff
1 parent0c39d10 commit43d9de1

34 files changed

+15
-1157
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);
@@ -868,7 +861,6 @@ brin_initialize_empty_new_buffer(Relation idxrel, Buffer buffer)
868861
"brin_initialize_empty_new_buffer: initializing blank page %u",
869862
BufferGetBlockNumber(buffer)));
870863

871-
ptrack_add_block(idxrel,BufferGetBlockNumber(buffer));
872864
START_CRIT_SECTION();
873865
page=BufferGetPage(buffer);
874866
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
Bufferbuf;
2928
Pagepage;
30-
RelFileNodernode;
31-
BlockNumberblkno;
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
BlockNumberregpgno;
5751
Pagepage;
5852
XLogRedoActionaction;
59-
RelFileNodernode;
60-
BlockNumberblkno;
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
Bufferbuffer;
152139
XLogRedoActionaction;
153-
RelFileNodernode;
154-
BlockNumberblkno;
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
Pagepage;
@@ -193,15 +174,9 @@ brin_xlog_samepage_update(XLogReaderState *record)
193174
xl_brin_samepage_update*xlrec;
194175
Bufferbuffer;
195176
XLogRedoActionaction;
196-
RelFileNodernode;
197-
BlockNumberblkno;
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
Sizetuplen;
@@ -245,21 +220,14 @@ brin_xlog_revmap_extend(XLogReaderState *record)
245220
Pagepage;
246221
BlockNumbertargetBlk;
247222
XLogRedoActionaction;
248-
RelFileNodernode;
249-
BlockNumberblkno;
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
Pagemetapg;

‎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
elseif (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))
@@ -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"
@@ -835,7 +834,6 @@ ginVacuumPostingTreeLeaf(Relation indexrel, Buffer buffer, GinVacuumState *gvs)
835834
computeLeafRecompressWALData(leaf);
836835

837836
/* Apply changes to page */
838-
ptrack_add_block(indexrel,BufferGetBlockNumber(buffer));
839837
START_CRIT_SECTION();
840838

841839
dataPlaceToPageLeafRecompress(buffer,leaf);
@@ -1811,7 +1809,6 @@ createPostingTree(Relation index, ItemPointerData *items, uint32 nitems,
18111809
page=BufferGetPage(buffer);
18121810
blkno=BufferGetBlockNumber(buffer);
18131811

1814-
ptrack_add_block(index,BufferGetBlockNumber(buffer));
18151812
START_CRIT_SECTION();
18161813

18171814
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
@@ -16,7 +16,6 @@
1616

1717
#include"access/gin_private.h"
1818
#include"access/xloginsert.h"
19-
#include"access/ptrack.h"
2019
#include"catalog/index.h"
2120
#include"miscadmin.h"
2221
#include"storage/bufmgr.h"
@@ -336,8 +335,6 @@ ginbuild(Relation heap, Relation index, IndexInfo *indexInfo)
336335
/* initialize the root page */
337336
RootBuffer=GinNewBuffer(index);
338337

339-
ptrack_add_block(index,BufferGetBlockNumber(MetaBuffer));
340-
ptrack_add_block(index,BufferGetBlockNumber(RootBuffer));
341338
START_CRIT_SECTION();
342339
GinInitMetabuffer(MetaBuffer);
343340
MarkBufferDirty(MetaBuffer);
@@ -446,8 +443,6 @@ ginbuildempty(Relation index)
446443
LockBuffer(RootBuffer,BUFFER_LOCK_EXCLUSIVE);
447444

448445
/* Initialize and xlog metabuffer and root buffer. */
449-
ptrack_add_block(index,BufferGetBlockNumber(MetaBuffer));
450-
ptrack_add_block(index,BufferGetBlockNumber(RootBuffer));
451446
START_CRIT_SECTION();
452447
GinInitMetabuffer(MetaBuffer);
453448
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"
@@ -638,7 +637,6 @@ ginUpdateStats(Relation index, const GinStatsData *stats)
638637
metapage=BufferGetPage(metabuffer);
639638
metadata=GinPageGetMeta(metapage);
640639

641-
ptrack_add_block(index,BufferGetBlockNumber(metabuffer));
642640
START_CRIT_SECTION();
643641

644642
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)
[8]ページ先頭
©2009-2025 Movatter.jp