Skip to content

[pull] master from postgres:master #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Aug 21, 2025
Merged

[pull] master from postgres:master #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/backend/storage/aio/aio_funcs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ pg_get_aios(PG_FUNCTION_ARGS)
for (uint64 i = 0; i < pgaio_ctl->io_handle_count; i++)
{
PgAioHandle *live_ioh = &pgaio_ctl->io_handles[i];
uint32 ioh_id = pgaio_io_get_id(live_ioh);
int ioh_id = pgaio_io_get_id(live_ioh);
Datum values[PG_GET_AIOS_COLS] = {0};
bool nulls[PG_GET_AIOS_COLS] = {0};
ProcNumber owner;
Expand Down Expand Up @@ -152,7 +152,7 @@ pg_get_aios(PG_FUNCTION_ARGS)
nulls[0] = false;

/* column: IO's id */
values[1] = UInt32GetDatum(ioh_id);
values[1] = Int32GetDatum(ioh_id);

/* column: IO's generation */
values[2] = Int64GetDatum(start_generation);
Expand Down
14 changes: 7 additions & 7 deletions src/backend/storage/aio/method_worker.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ typedef struct PgAioWorkerSubmissionQueue
uint32 mask;
uint32 head;
uint32 tail;
uint32 sqes[FLEXIBLE_ARRAY_MEMBER];
int sqes[FLEXIBLE_ARRAY_MEMBER];
} PgAioWorkerSubmissionQueue;

typedef struct PgAioWorkerSlot
Expand Down Expand Up @@ -107,7 +107,7 @@ pgaio_worker_queue_shmem_size(int *queue_size)
*queue_size = pg_nextpower2_32(io_worker_queue_size);

return offsetof(PgAioWorkerSubmissionQueue, sqes) +
sizeof(uint32) * *queue_size;
sizeof(int) * *queue_size;
}

static size_t
Expand Down Expand Up @@ -198,15 +198,15 @@ pgaio_worker_submission_queue_insert(PgAioHandle *ioh)
return true;
}

static uint32
static int
pgaio_worker_submission_queue_consume(void)
{
PgAioWorkerSubmissionQueue *queue;
uint32 result;
int result;

queue = io_worker_submission_queue;
if (queue->tail == queue->head)
return UINT32_MAX; /* empty */
return -1; /* empty */

result = queue->sqes[queue->tail];
queue->tail = (queue->tail + 1) & (queue->size - 1);
Expand Down Expand Up @@ -470,7 +470,7 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
* to ensure that we don't see an outdated data in the handle.
*/
LWLockAcquire(AioWorkerSubmissionQueueLock, LW_EXCLUSIVE);
if ((io_index = pgaio_worker_submission_queue_consume()) == UINT32_MAX)
if ((io_index = pgaio_worker_submission_queue_consume()) == -1)
{
/*
* Nothing to do. Mark self idle.
Expand Down Expand Up @@ -500,7 +500,7 @@ IoWorkerMain(const void *startup_data, size_t startup_data_len)
for (int i = 0; i < nlatches; ++i)
SetLatch(latches[i]);

if (io_index != UINT32_MAX)
if (io_index != -1)
{
PgAioHandle *ioh = NULL;

Expand Down