From 0c9dee9d0699399b798a45e41abc6561e3952b66 Mon Sep 17 00:00:00 2001 From: Konstantin Knizhnik Date: Mon, 3 Jun 2024 21:36:37 +0300 Subject: [PATCH] Rebase with main --- pgxn/neon/pagestore_smgr.c | 4 ++-- vendor/postgres-v14 | 2 +- vendor/postgres-v15 | 2 +- vendor/postgres-v16 | 2 +- vendor/revisions.json | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pgxn/neon/pagestore_smgr.c b/pgxn/neon/pagestore_smgr.c index 1ec6391666..c318c18bc2 100644 --- a/pgxn/neon/pagestore_smgr.c +++ b/pgxn/neon/pagestore_smgr.c @@ -2650,8 +2650,8 @@ neon_read(SMgrRelation reln, ForkNumber forkNum, BlockNumber blkno, void *buffer } else { - request_lsn = neon_get_request_lsn(&latest, InfoFromSMgrRel(reln), forkNum, blkno); - neon_read_at_lsn(InfoFromSMgrRel(reln), forkNum, blkno, request_lsn, latest, buffer); + request_lsns = neon_get_request_lsns(InfoFromSMgrRel(reln), forkNum, blkno); + neon_read_at_lsn(InfoFromSMgrRel(reln), forkNum, blkno, request_lsns, buffer); } #ifdef DEBUG_COMPARE_LOCAL if (forkNum == MAIN_FORKNUM && IS_LOCAL_REL(reln)) diff --git a/vendor/postgres-v14 b/vendor/postgres-v14 index 17e0f5ff4e..a9bfeec24d 160000 --- a/vendor/postgres-v14 +++ b/vendor/postgres-v14 @@ -1 +1 @@ -Subproject commit 17e0f5ff4e1905691aa40e1e08f9b79b14c99652 +Subproject commit a9bfeec24d08f36eaffcd3548284e4732ad57a5c diff --git a/vendor/postgres-v15 b/vendor/postgres-v15 index c2c3d40534..8cc683b542 160000 --- a/vendor/postgres-v15 +++ b/vendor/postgres-v15 @@ -1 +1 @@ -Subproject commit c2c3d40534db97d83dd7e185d1971e707fa2f445 +Subproject commit 8cc683b5428b9532f3897f3842fe44af90048617 diff --git a/vendor/postgres-v16 b/vendor/postgres-v16 index b228f20372..e2cccb954d 160000 --- a/vendor/postgres-v16 +++ b/vendor/postgres-v16 @@ -1 +1 @@ -Subproject commit b228f20372ebcabfd7946647cb7adbd38bacb14a +Subproject commit e2cccb954d4aa96713f2ae4a72b2806300f199f7 diff --git a/vendor/revisions.json b/vendor/revisions.json index 93a42f27fd..9ae7ddaaec 100644 --- a/vendor/revisions.json +++ b/vendor/revisions.json @@ -1,5 +1,5 @@ { - "postgres-v16": "a673c9fd4af439512013713b9b537487927bbc63", - "postgres-v15": "411a463af69cd7d5480e158da3d8c23f46cb31cb", - "postgres-v14": "5ed0718551ccce80bd3644dd0330deeb6ffd919b" + "v16": ["16.3", "e2cccb954d4aa96713f2ae4a72b2806300f199f7"], + "v15": ["15.7", "8cc683b5428b9532f3897f3842fe44af90048617"], + "v14": ["14.12", "a9bfeec24d08f36eaffcd3548284e4732ad57a5c"] }