rdelaage
/
postgresql
mirror of https://git.postgresql.org/git/postgresql.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Run pgindent on heapam.c 

An upcoming patch by Melanie Plageman does some refactoring work in this
area.  Run pgindent on that file now before making any changes so that
it's easier to maintain/evolve each of the individual patches doing the
refactor work.  Additionally, add a few new required typedefs to the list
to make it easier to do future pgindent runs on this file during the
refactor work.

Discussion: https://postgr.es/m/CAAKRu_YSOnhKsDyFcqJsKtBSrd32DP-jjXmv7hL0BPD-z0TGXQ@mail.gmail.com
This commit is contained in:
David Rowley 2023-01-23 23:08:38 +13:00
parent 236f1ea84c
commit 009dbdea02
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/backend/access/heap/heapam.c
View File

@ -561,7 +561,7 @@ heapgettup(HeapScanDesc scan,
}
}
else
block = scan->rs_startblock; /* first page */
block = scan->rs_startblock; /* first page */
heapgetpage((TableScanDesc) scan, block);
lineoff = FirstOffsetNumber; /* first offnum */
scan->rs_inited = true;
@ -569,7 +569,7 @@ heapgettup(HeapScanDesc scan,
else
{
/* continue from previously returned page/tuple */
block = scan->rs_cblock; /* current page */
block = scan->rs_cblock; /* current page */
lineoff = /* next offnum */
OffsetNumberNext(ItemPointerGetOffsetNumber(&(tuple->t_self)));
}
@ -623,7 +623,7 @@ heapgettup(HeapScanDesc scan,
else
{
/* continue from previously returned page/tuple */
block = scan->rs_cblock; /* current page */
block = scan->rs_cblock; /* current page */
}
LockBuffer(scan->rs_cbuf, BUFFER_LOCK_SHARE);
@ -769,7 +769,7 @@ heapgettup(HeapScanDesc scan,
scan->rs_parallelworkerdata;
block = table_block_parallelscan_nextpage(scan->rs_base.rs_rd,
pbscanwork, pbscan);
pbscanwork, pbscan);
finished = (block == InvalidBlockNumber);
}
else
@ -899,7 +899,7 @@ heapgettup_pagemode(HeapScanDesc scan,
}
}
else
block = scan->rs_startblock; /* first page */
block = scan->rs_startblock; /* first page */
heapgetpage((TableScanDesc) scan, block);
lineindex = 0;
scan->rs_inited = true;
@ -907,7 +907,7 @@ heapgettup_pagemode(HeapScanDesc scan,
else
{
/* continue from previously returned page/tuple */
block = scan->rs_cblock; /* current page */
block = scan->rs_cblock; /* current page */
lineindex = scan->rs_cindex + 1;
}
@ -958,7 +958,7 @@ heapgettup_pagemode(HeapScanDesc scan,
else
{
/* continue from previously returned page/tuple */
block = scan->rs_cblock; /* current page */
block = scan->rs_cblock; /* current page */
}
page = BufferGetPage(scan->rs_cbuf);
@ -1078,7 +1078,7 @@ heapgettup_pagemode(HeapScanDesc scan,
scan->rs_parallelworkerdata;
block = table_block_parallelscan_nextpage(scan->rs_base.rs_rd,
pbscanwork, pbscan);
pbscanwork, pbscan);
finished = (block == InvalidBlockNumber);
}
else
@ -2722,6 +2722,7 @@ heap_delete(Relation relation, ItemPointer tid,
tp.t_self = *tid;
l1:
/*
* If we didn't pin the visibility map page and the page has become all
* visible while we were busy locking the buffer, we'll have to unlock and

3
src/tools/pgindent/typedefs.list
View File

@ -1090,11 +1090,13 @@ HeadlineJsonState
HeadlineParsedText
HeadlineWordEntry
HeapCheckContext
HeapPageFreeze
HeapScanDesc
HeapTuple
HeapTupleData
HeapTupleFields
HeapTupleForceOption
HeapTupleFreeze
HeapTupleHeader
HeapTupleHeaderData
HeapTupleTableSlot
@ -3838,6 +3840,7 @@ xl_hash_vacuum_one_page
xl_heap_confirm
xl_heap_delete
xl_heap_freeze_page
xl_heap_freeze_plan
xl_heap_freeze_tuple
xl_heap_header
xl_heap_inplace