From 7c7ed2e0720607e6613f7b379edbe44e3c975e57 Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Tue, 18 Oct 2022 09:06:51 +0300 Subject: [PATCH] Replace prefetch_reset with prefetch_in_progress in SMGR API --- pgxn/neon/pagestore_smgr.c | 12 ++++++------ vendor/postgres-v14 | 2 +- vendor/postgres-v15 | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pgxn/neon/pagestore_smgr.c b/pgxn/neon/pagestore_smgr.c index 1187550f2a..392c7d0ee5 100644 --- a/pgxn/neon/pagestore_smgr.c +++ b/pgxn/neon/pagestore_smgr.c @@ -127,7 +127,7 @@ static UnloggedBuildPhase unlogged_build_phase = UNLOGGED_BUILD_NOT_IN_PROGRESS; * all prefetch responses has to be consumed. */ -#define MAX_PREFETCH_REQUESTS 128 +#define MAX_PREFETCH_REQUESTS 1024 BufferTag prefetch_requests[MAX_PREFETCH_REQUESTS]; BufferTag prefetch_responses[MAX_PREFETCH_REQUESTS]; @@ -1006,12 +1006,12 @@ neon_close(SMgrRelation reln, ForkNumber forknum) /* - * neon_reset_prefetch() -- reoe all previously rgistered prefeth requests + * neon_prefetch_in_progress() -- reoe all previously rgistered prefeth requests */ -void -neon_reset_prefetch(SMgrRelation reln) +bool +neon_prefetch_in_progress(SMgrRelation reln) { - n_prefetch_requests = 0; + return n_prefetch_requests + n_prefetch_responses != 0; } /* @@ -1816,7 +1816,7 @@ static const struct f_smgr neon_smgr = .smgr_unlink = neon_unlink, .smgr_extend = neon_extend, .smgr_prefetch = neon_prefetch, - .smgr_reset_prefetch = neon_reset_prefetch, + .smgr_prefetch_in_progress = neon_prefetch_in_progress, .smgr_read = neon_read, .smgr_write = neon_write, .smgr_writeback = neon_writeback, diff --git a/vendor/postgres-v14 b/vendor/postgres-v14 index bdd502a8da..b50e108572 160000 --- a/vendor/postgres-v14 +++ b/vendor/postgres-v14 @@ -1 +1 @@ -Subproject commit bdd502a8da5de9e0ac709caabc0401455c97d235 +Subproject commit b50e1085720c5e1dba3e96ffa98e413350ffd2eb diff --git a/vendor/postgres-v15 b/vendor/postgres-v15 index 64558b386b..ae55e380cf 160000 --- a/vendor/postgres-v15 +++ b/vendor/postgres-v15 @@ -1 +1 @@ -Subproject commit 64558b386bcd5a3300163ec7ea5d7f31cef8593c +Subproject commit ae55e380cfcd43f51865a9d89ad1db3fb3914397