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

Commit8b65cf4

Browse files
committed
Modify BufferGetPage() to prepare for "snapshot too old" feature
This patch is a no-op patch which is intended to reduce the chancesof failures of omission once the functional part of the "snapshottoo old" patch goes in. It adds parameters for snapshot, relation,and an enum to specify whether the snapshot age check needs to bedone for the page at this point. This initial patch passes NULLfor the first two new parameters and BGP_NO_SNAPSHOT_TEST for thethird. The follow-on patch will change the places where the testneeds to be made.
1 parent689f9a0 commit8b65cf4

File tree

65 files changed

+735
-522
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+735
-522
lines changed

‎contrib/bloom/blinsert.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,8 @@ blinsert(Relation index, Datum *values, bool *isnull,
204204
*/
205205
metaBuffer=ReadBuffer(index,BLOOM_METAPAGE_BLKNO);
206206
LockBuffer(metaBuffer,BUFFER_LOCK_SHARE);
207-
metaData=BloomPageGetMeta(BufferGetPage(metaBuffer));
207+
metaData=BloomPageGetMeta(BufferGetPage(metaBuffer,NULL,NULL,
208+
BGP_NO_SNAPSHOT_TEST));
208209

209210
if (metaData->nEnd>metaData->nStart)
210211
{

‎contrib/bloom/blscan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ blgetbitmap(IndexScanDesc scan, TIDBitmap *tbm)
138138
blkno,RBM_NORMAL,bas);
139139

140140
LockBuffer(buffer,BUFFER_LOCK_SHARE);
141-
page=BufferGetPage(buffer);
141+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
142142

143143
if (!BloomPageIsDeleted(page))
144144
{

‎contrib/bloom/blutils.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -139,11 +139,12 @@ initBloomState(BloomState *state, Relation index)
139139
buffer=ReadBuffer(index,BLOOM_METAPAGE_BLKNO);
140140
LockBuffer(buffer,BUFFER_LOCK_SHARE);
141141

142-
page=BufferGetPage(buffer);
142+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
143143

144144
if (!BloomPageIsMeta(page))
145145
elog(ERROR,"Relation is not a bloom index");
146-
meta=BloomPageGetMeta(BufferGetPage(buffer));
146+
meta=BloomPageGetMeta(BufferGetPage(buffer,NULL,NULL,
147+
BGP_NO_SNAPSHOT_TEST));
147148

148149
if (meta->magickNumber!=BLOOM_MAGICK_NUMBER)
149150
elog(ERROR,"Relation is not a bloom index");
@@ -315,7 +316,8 @@ BloomNewBuffer(Relation index)
315316
*/
316317
if (ConditionalLockBuffer(buffer))
317318
{
318-
Pagepage=BufferGetPage(buffer);
319+
Pagepage=BufferGetPage(buffer,NULL,NULL,
320+
BGP_NO_SNAPSHOT_TEST);
319321

320322
if (PageIsNew(page))
321323
returnbuffer;/* OK to use, if never initialized */

‎contrib/bloom/blvacuum.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ blvacuumcleanup(IndexVacuumInfo *info, IndexBulkDeleteResult *stats)
194194
buffer=ReadBufferExtended(index,MAIN_FORKNUM,blkno,
195195
RBM_NORMAL,info->strategy);
196196
LockBuffer(buffer,BUFFER_LOCK_SHARE);
197-
page=(Page)BufferGetPage(buffer);
197+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
198198

199199
if (BloomPageIsDeleted(page))
200200
{

‎contrib/pageinspect/btreefuncs.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ typedef struct BTPageStat
9090
staticvoid
9191
GetBTPageStatistics(BlockNumberblkno,Bufferbuffer,BTPageStat*stat)
9292
{
93-
Pagepage=BufferGetPage(buffer);
93+
Pagepage=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
9494
PageHeaderphdr= (PageHeader)page;
9595
OffsetNumbermaxoff=PageGetMaxOffsetNumber(page);
9696
BTPageOpaqueopaque= (BTPageOpaque)PageGetSpecialPointer(page);
@@ -317,7 +317,9 @@ bt_page_items(PG_FUNCTION_ARGS)
317317
uargs=palloc(sizeof(structuser_args));
318318

319319
uargs->page=palloc(BLCKSZ);
320-
memcpy(uargs->page,BufferGetPage(buffer),BLCKSZ);
320+
memcpy(uargs->page,
321+
BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST),
322+
BLCKSZ);
321323

322324
UnlockReleaseBuffer(buffer);
323325
relation_close(rel,AccessShareLock);
@@ -447,7 +449,7 @@ bt_metap(PG_FUNCTION_ARGS)
447449
buffer=ReadBuffer(rel,0);
448450
LockBuffer(buffer,BUFFER_LOCK_SHARE);
449451

450-
page=BufferGetPage(buffer);
452+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
451453
metad=BTPageGetMeta(page);
452454

453455
/* Build a tuple descriptor for our result type */

‎contrib/pageinspect/rawpage.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,9 @@ get_raw_page_internal(text *relname, ForkNumber forknum, BlockNumber blkno)
147147
buf=ReadBufferExtended(rel,forknum,blkno,RBM_NORMAL,NULL);
148148
LockBuffer(buf,BUFFER_LOCK_SHARE);
149149

150-
memcpy(raw_page_data,BufferGetPage(buf),BLCKSZ);
150+
memcpy(raw_page_data,
151+
BufferGetPage(buf,NULL,NULL,BGP_NO_SNAPSHOT_TEST),
152+
BLCKSZ);
151153

152154
LockBuffer(buf,BUFFER_LOCK_UNLOCK);
153155
ReleaseBuffer(buf);

‎contrib/pg_visibility/pg_visibility.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pg_visibility(PG_FUNCTION_ARGS)
107107
buffer=ReadBuffer(rel,blkno);
108108
LockBuffer(buffer,BUFFER_LOCK_SHARE);
109109

110-
page=BufferGetPage(buffer);
110+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
111111
values[2]=BoolGetDatum(PageIsAllVisible(page));
112112

113113
UnlockReleaseBuffer(buffer);
@@ -333,7 +333,7 @@ collect_visibility_data(Oid relid, bool include_pd)
333333
bstrategy);
334334
LockBuffer(buffer,BUFFER_LOCK_SHARE);
335335

336-
page=BufferGetPage(buffer);
336+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
337337
if (PageIsAllVisible(page))
338338
info->bits[blkno] |= (1 <<2);
339339

‎contrib/pgstattuple/pgstatapprox.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ statapprox_heap(Relation rel, output_type *stat)
100100

101101
LockBuffer(buf,BUFFER_LOCK_SHARE);
102102

103-
page=BufferGetPage(buf);
103+
page=BufferGetPage(buf,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
104104

105105
/*
106106
* It's not safe to call PageGetHeapFreeSpace() on new pages, so we

‎contrib/pgstattuple/pgstatindex.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ pgstatindex_impl(Relation rel, FunctionCallInfo fcinfo)
173173
*/
174174
{
175175
Bufferbuffer=ReadBufferExtended(rel,MAIN_FORKNUM,0,RBM_NORMAL,bstrategy);
176-
Pagepage=BufferGetPage(buffer);
176+
Pagepage=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
177177
BTMetaPageData*metad=BTPageGetMeta(page);
178178

179179
indexStat.version=metad->btm_version;
@@ -211,7 +211,7 @@ pgstatindex_impl(Relation rel, FunctionCallInfo fcinfo)
211211
buffer=ReadBufferExtended(rel,MAIN_FORKNUM,blkno,RBM_NORMAL,bstrategy);
212212
LockBuffer(buffer,BUFFER_LOCK_SHARE);
213213

214-
page=BufferGetPage(buffer);
214+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
215215
opaque= (BTPageOpaque)PageGetSpecialPointer(page);
216216

217217
/* Determine page type, and update totals */
@@ -399,7 +399,7 @@ pgstatginindex(PG_FUNCTION_ARGS)
399399
*/
400400
buffer=ReadBuffer(rel,GIN_METAPAGE_BLKNO);
401401
LockBuffer(buffer,GIN_SHARE);
402-
page=BufferGetPage(buffer);
402+
page=BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
403403
metadata=GinPageGetMeta(page);
404404

405405
stats.version=metadata->ginVersion;

‎contrib/pgstattuple/pgstattuple.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -320,7 +320,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
320320
buffer=ReadBufferExtended(rel,MAIN_FORKNUM,block,
321321
RBM_NORMAL,scan->rs_strategy);
322322
LockBuffer(buffer,BUFFER_LOCK_SHARE);
323-
stat.free_space+=PageGetHeapFreeSpace((Page)BufferGetPage(buffer));
323+
stat.free_space+=PageGetHeapFreeSpace
324+
(BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST));
324325
UnlockReleaseBuffer(buffer);
325326
block++;
326327
}
@@ -333,7 +334,8 @@ pgstat_heap(Relation rel, FunctionCallInfo fcinfo)
333334
buffer=ReadBufferExtended(rel,MAIN_FORKNUM,block,
334335
RBM_NORMAL,scan->rs_strategy);
335336
LockBuffer(buffer,BUFFER_LOCK_SHARE);
336-
stat.free_space+=PageGetHeapFreeSpace((Page)BufferGetPage(buffer));
337+
stat.free_space+=PageGetHeapFreeSpace
338+
(BufferGetPage(buffer,NULL,NULL,BGP_NO_SNAPSHOT_TEST));
337339
UnlockReleaseBuffer(buffer);
338340
block++;
339341
}
@@ -358,7 +360,7 @@ pgstat_btree_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
358360

359361
buf=ReadBufferExtended(rel,MAIN_FORKNUM,blkno,RBM_NORMAL,bstrategy);
360362
LockBuffer(buf,BT_READ);
361-
page=BufferGetPage(buf);
363+
page=BufferGetPage(buf,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
362364

363365
/* Page is valid, see what to do with it */
364366
if (PageIsNew(page))
@@ -402,7 +404,7 @@ pgstat_hash_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
402404

403405
_hash_getlock(rel,blkno,HASH_SHARE);
404406
buf=_hash_getbuf_with_strategy(rel,blkno,HASH_READ,0,bstrategy);
405-
page=BufferGetPage(buf);
407+
page=BufferGetPage(buf,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
406408

407409
if (PageGetSpecialSize(page)==MAXALIGN(sizeof(HashPageOpaqueData)))
408410
{
@@ -447,7 +449,7 @@ pgstat_gist_page(pgstattuple_type *stat, Relation rel, BlockNumber blkno,
447449
buf=ReadBufferExtended(rel,MAIN_FORKNUM,blkno,RBM_NORMAL,bstrategy);
448450
LockBuffer(buf,GIST_SHARE);
449451
gistcheckpage(rel,buf);
450-
page=BufferGetPage(buf);
452+
page=BufferGetPage(buf,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
451453

452454
if (GistPageIsLeaf(page))
453455
{

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

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,8 @@ brininsert(Relation idxRel, Datum *values, bool *nulls,
208208
}
209209
else
210210
{
211-
Pagepage=BufferGetPage(buf);
211+
Pagepage=BufferGetPage(buf,NULL,NULL,
212+
BGP_NO_SNAPSHOT_TEST);
212213
ItemIdlp=PageGetItemId(page,off);
213214
Sizeorigsz;
214215
BrinTuple*origtup;
@@ -617,7 +618,8 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
617618
Assert(BufferGetBlockNumber(meta)==BRIN_METAPAGE_BLKNO);
618619
LockBuffer(meta,BUFFER_LOCK_EXCLUSIVE);
619620

620-
brin_metapage_init(BufferGetPage(meta),BrinGetPagesPerRange(index),
621+
brin_metapage_init(BufferGetPage(meta,NULL,NULL,BGP_NO_SNAPSHOT_TEST),
622+
BrinGetPagesPerRange(index),
621623
BRIN_CURRENT_VERSION);
622624
MarkBufferDirty(meta);
623625

@@ -636,7 +638,7 @@ brinbuild(Relation heap, Relation index, IndexInfo *indexInfo)
636638

637639
recptr=XLogInsert(RM_BRIN_ID,XLOG_BRIN_CREATE_INDEX);
638640

639-
page=BufferGetPage(meta);
641+
page=BufferGetPage(meta,NULL,NULL,BGP_NO_SNAPSHOT_TEST);
640642
PageSetLSN(page,recptr);
641643
}
642644

@@ -686,7 +688,9 @@ brinbuildempty(Relation index)
686688

687689
/* Initialize and xlog metabuffer. */
688690
START_CRIT_SECTION();
689-
brin_metapage_init(BufferGetPage(metabuf),BrinGetPagesPerRange(index),
691+
brin_metapage_init(BufferGetPage(metabuf,NULL,NULL,
692+
BGP_NO_SNAPSHOT_TEST),
693+
BrinGetPagesPerRange(index),
690694
BRIN_CURRENT_VERSION);
691695
MarkBufferDirty(metabuf);
692696
log_newpage_buffer(metabuf, false);
@@ -941,7 +945,8 @@ terminate_brin_buildstate(BrinBuildState *state)
941945
{
942946
Pagepage;
943947

944-
page=BufferGetPage(state->bs_currentInsertBuf);
948+
page=BufferGetPage(state->bs_currentInsertBuf,NULL,NULL,
949+
BGP_NO_SNAPSHOT_TEST);
945950
RecordPageWithFreeSpace(state->bs_irel,
946951
BufferGetBlockNumber(state->bs_currentInsertBuf),
947952
PageGetFreeSpace(page));

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp