database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-07-03 20:02:46 +03:00
Code Activity

Make more use of binaryheap_empty() and binaryheap_size().

Browse Source 
A few places were accessing bh_size directly instead of via these
handy macros.

Author: Aleksander Alekseev <aleksander@timescale.com>
Discussion: https://postgr.es/m/CAJ7c6TPQMVL%2B028T4zuw9ZqL5Du9JavOLhBQLkJeK0RznYx_6w%40mail.gmail.com
This commit is contained in:
Nathan Bossart
2025-07-01 14:19:07 -05:00
parent e6115394d4
commit 32bcf568cb
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/backend/postmaster/pgarch.c
View File

@ -718,15 +718,15 @@ pgarch_readyXlog(char *xlog)
/* /*
* Store the file in our max-heap if it has a high enough priority. * Store the file in our max-heap if it has a high enough priority.
*/ */
if (arch_files->arch_heap->bh_size < NUM_FILES_PER_DIRECTORY_SCAN) if (binaryheap_size(arch_files->arch_heap) < NUM_FILES_PER_DIRECTORY_SCAN)
{ {
/* If the heap isn't full yet, quickly add it. */ /* If the heap isn't full yet, quickly add it. */
arch_file = arch_files->arch_filenames[arch_files->arch_heap->bh_size]; arch_file = arch_files->arch_filenames[binaryheap_size(arch_files->arch_heap)];
strcpy(arch_file, basename); strcpy(arch_file, basename);
binaryheap_add_unordered(arch_files->arch_heap, CStringGetDatum(arch_file)); binaryheap_add_unordered(arch_files->arch_heap, CStringGetDatum(arch_file));
/* If we just filled the heap, make it a valid one. */ /* If we just filled the heap, make it a valid one. */
if (arch_files->arch_heap->bh_size == NUM_FILES_PER_DIRECTORY_SCAN) if (binaryheap_size(arch_files->arch_heap) == NUM_FILES_PER_DIRECTORY_SCAN)
binaryheap_build(arch_files->arch_heap); binaryheap_build(arch_files->arch_heap);
} }
else if (ready_file_comparator(binaryheap_first(arch_files->arch_heap), else if (ready_file_comparator(binaryheap_first(arch_files->arch_heap),
@ -744,21 +744,21 @@ pgarch_readyXlog(char *xlog)
FreeDir(rldir); FreeDir(rldir);
/* If no files were found, simply return. */ /* If no files were found, simply return. */
if (arch_files->arch_heap->bh_size == 0) if (binaryheap_empty(arch_files->arch_heap))
return false; return false;
/* /*
* If we didn't fill the heap, we didn't make it a valid one. Do that * If we didn't fill the heap, we didn't make it a valid one. Do that
* now. * now.
*/ */
if (arch_files->arch_heap->bh_size < NUM_FILES_PER_DIRECTORY_SCAN) if (binaryheap_size(arch_files->arch_heap) < NUM_FILES_PER_DIRECTORY_SCAN)
binaryheap_build(arch_files->arch_heap); binaryheap_build(arch_files->arch_heap);
/* /*
* Fill arch_files array with the files to archive in ascending order of * Fill arch_files array with the files to archive in ascending order of
* priority. * priority.
*/ */
arch_files->arch_files_size = arch_files->arch_heap->bh_size; arch_files->arch_files_size = binaryheap_size(arch_files->arch_heap);
for (int i = 0; i < arch_files->arch_files_size; i++) for (int i = 0; i < arch_files->arch_files_size; i++)
arch_files->arch_files[i] = DatumGetCString(binaryheap_remove_first(arch_files->arch_heap)); arch_files->arch_files[i] = DatumGetCString(binaryheap_remove_first(arch_files->arch_heap));

2
src/backend/replication/logical/reorderbuffer.c
View File

@ -1415,7 +1415,7 @@ ReorderBufferIterTXNNext(ReorderBuffer *rb, ReorderBufferIterTXNState *state)
int32 off; int32 off;
/* nothing there anymore */ /* nothing there anymore */
if (state->heap->bh_size == 0) if (binaryheap_empty(state->heap))
return NULL; return NULL;
off = DatumGetInt32(binaryheap_first(state->heap)); off = DatumGetInt32(binaryheap_first(state->heap));