summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rowley2023-01-23 10:08:38 +0000
committerDavid Rowley2023-01-23 10:08:38 +0000
commit009dbdea02d74c72db2d1a57d5299f94f91fa975 (patch)
treec61a7198573f3b13539f14862f5621e9226e7789
parent236f1ea84c4ca6a29d790fac4b48eba12a74443c (diff)
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
-rw-r--r--src/backend/access/heap/heapam.c17
-rw-r--r--src/tools/pgindent/typedefs.list3
2 files changed, 12 insertions, 8 deletions
diff --git a/src/backend/access/heap/heapam.c b/src/backend/access/heap/heapam.c
index 388df94a44..e6024a980b 100644
--- a/src/backend/access/heap/heapam.c
+++ b/src/backend/access/heap/heapam.c
@@ -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
diff --git a/src/tools/pgindent/typedefs.list b/src/tools/pgindent/typedefs.list
index 24510ac29e..51484ca7e2 100644
--- a/src/tools/pgindent/typedefs.list
+++ b/src/tools/pgindent/typedefs.list
@@ -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