NotificationsYou must be signed in to change notification settings
Fork6
Star31

Commit009dbde

committed

Run pgindent on heapam.c

An upcoming patch by Melanie Plageman does some refactoring work in thisarea. Run pgindent on that file now before making any changes so thatit's easier to maintain/evolve each of the individual patches doing therefactor work. Additionally, add a few new required typedefs to the listto make it easier to do future pgindent runs on this file during therefactor work.Discussion:https://postgr.es/m/CAAKRu_YSOnhKsDyFcqJsKtBSrd32DP-jjXmv7hL0BPD-z0TGXQ@mail.gmail.com

1 parent236f1ea commit009dbdeCopy full SHA for 009dbde

File tree

2 files changed

+12

-8

lines changed

src
- backend/access/heap
  - heapam.c
- tools/pgindent
  - typedefs.list

2 files changed

+12

-8

lines changed

`‎src/backend/access/heap/heapam.c`

Lines changed: 9 additions & 8 deletions

Original file line number	Diff line number	Diff line change
`@@ -561,15 +561,15 @@ heapgettup(HeapScanDesc scan,`
`561`	`561`	`}`
`562`	`562`	`}`
`563`	`563`	`else`
`564`		`-block=scan->rs_startblock;/* first page */`
	`564`	`+block=scan->rs_startblock;/* first page */`
`565`	`565`	`heapgetpage((TableScanDesc)scan,block);`
`566`	`566`	`lineoff=FirstOffsetNumber;/* first offnum */`
`567`	`567`	`scan->rs_inited= true;`
`568`	`568`	`}`
`569`	`569`	`else`
`570`	`570`	`{`
`571`	`571`	`/* continue from previously returned page/tuple */`
`572`		`-block=scan->rs_cblock;/* current page */`
	`572`	`+block=scan->rs_cblock;/* current page */`
`573`	`573`	`lineoff=/* next offnum */`
`574`	`574`	`OffsetNumberNext(ItemPointerGetOffsetNumber(&(tuple->t_self)));`
`575`	`575`	`}`
`@@ -623,7 +623,7 @@ heapgettup(HeapScanDesc scan,`
`623`	`623`	`else`
`624`	`624`	`{`
`625`	`625`	`/* continue from previously returned page/tuple */`
`626`		`-block=scan->rs_cblock;/* current page */`
	`626`	`+block=scan->rs_cblock;/* current page */`
`627`	`627`	`}`
`628`	`628`
`629`	`629`	`LockBuffer(scan->rs_cbuf,BUFFER_LOCK_SHARE);`
`@@ -769,7 +769,7 @@ heapgettup(HeapScanDesc scan,`
`769`	`769`	`scan->rs_parallelworkerdata;`
`770`	`770`
`771`	`771`	`block=table_block_parallelscan_nextpage(scan->rs_base.rs_rd,`
`772`		`-pbscanwork,pbscan);`
	`772`	`+pbscanwork,pbscan);`
`773`	`773`	`finished= (block==InvalidBlockNumber);`
`774`	`774`	`}`
`775`	`775`	`else`
`@@ -899,15 +899,15 @@ heapgettup_pagemode(HeapScanDesc scan,`
`899`	`899`	`}`
`900`	`900`	`}`
`901`	`901`	`else`
`902`		`-block=scan->rs_startblock;/* first page */`
	`902`	`+block=scan->rs_startblock;/* first page */`
`903`	`903`	`heapgetpage((TableScanDesc)scan,block);`
`904`	`904`	`lineindex=0;`
`905`	`905`	`scan->rs_inited= true;`
`906`	`906`	`}`
`907`	`907`	`else`
`908`	`908`	`{`
`909`	`909`	`/* continue from previously returned page/tuple */`
`910`		`-block=scan->rs_cblock;/* current page */`
	`910`	`+block=scan->rs_cblock;/* current page */`
`911`	`911`	`lineindex=scan->rs_cindex+1;`
`912`	`912`	`}`
`913`	`913`
`@@ -958,7 +958,7 @@ heapgettup_pagemode(HeapScanDesc scan,`
`958`	`958`	`else`
`959`	`959`	`{`
`960`	`960`	`/* continue from previously returned page/tuple */`
`961`		`-block=scan->rs_cblock;/* current page */`
	`961`	`+block=scan->rs_cblock;/* current page */`
`962`	`962`	`}`
`963`	`963`
`964`	`964`	`page=BufferGetPage(scan->rs_cbuf);`
`@@ -1078,7 +1078,7 @@ heapgettup_pagemode(HeapScanDesc scan,`
`1078`	`1078`	`scan->rs_parallelworkerdata;`
`1079`	`1079`
`1080`	`1080`	`block=table_block_parallelscan_nextpage(scan->rs_base.rs_rd,`
`1081`		`-pbscanwork,pbscan);`
	`1081`	`+pbscanwork,pbscan);`
`1082`	`1082`	`finished= (block==InvalidBlockNumber);`
`1083`	`1083`	`}`
`1084`	`1084`	`else`
`@@ -2722,6 +2722,7 @@ heap_delete(Relation relation, ItemPointer tid,`
`2722`	`2722`	`tp.t_self=*tid;`
`2723`	`2723`
`2724`	`2724`	`l1:`
	`2725`	`+`
`2725`	`2726`	`/*`
`2726`	`2727`	`* If we didn't pin the visibility map page and the page has become all`
`2727`	`2728`	`* visible while we were busy locking the buffer, we'll have to unlock and`

`‎src/tools/pgindent/typedefs.list`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1090,11 +1090,13 @@ HeadlineJsonState`
`1090`	`1090`	`HeadlineParsedText`
`1091`	`1091`	`HeadlineWordEntry`
`1092`	`1092`	`HeapCheckContext`
	`1093`	`+HeapPageFreeze`
`1093`	`1094`	`HeapScanDesc`
`1094`	`1095`	`HeapTuple`
`1095`	`1096`	`HeapTupleData`
`1096`	`1097`	`HeapTupleFields`
`1097`	`1098`	`HeapTupleForceOption`
	`1099`	`+HeapTupleFreeze`
`1098`	`1100`	`HeapTupleHeader`
`1099`	`1101`	`HeapTupleHeaderData`
`1100`	`1102`	`HeapTupleTableSlot`
`@@ -3838,6 +3840,7 @@ xl_hash_vacuum_one_page`
`3838`	`3840`	`xl_heap_confirm`
`3839`	`3841`	`xl_heap_delete`
`3840`	`3842`	`xl_heap_freeze_page`
	`3843`	`+xl_heap_freeze_plan`
`3841`	`3844`	`xl_heap_freeze_tuple`
`3842`	`3845`	`xl_heap_header`
`3843`	`3846`	`xl_heap_inplace`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit009dbde

File tree

2 files changed

2 files changed

`‎src/backend/access/heap/heapam.c`

`‎src/tools/pgindent/typedefs.list`

0 commit comments