rust/neon
1
0
Fork 0
mirror of https://github.com/neondatabase/neon.git synced 2025-12-26 23:59:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(compute): Postgres 17.3, 16.7, 15.11 and 14.16 (#10771)

Browse Source 
## Summary of changes

Bump all minor versions. The only non-trivial conflict was between
-
0350b876b0
- and
bd09a752f4

It seems that just adding this extra argument is enough.

I also got conflict with

c1c9df3159
but for some reason only in PG 15. Yet, that was a trivial one around
```c
		if (XLogCtl)
			LWLockRelease(ControlFileLock);
		/* durable_rename already emitted log message */
		return false;
```
in `xlog.c`

## Postgres PRs

- https://github.com/neondatabase/postgres/pull/580
- https://github.com/neondatabase/postgres/pull/579
- https://github.com/neondatabase/postgres/pull/577
- https://github.com/neondatabase/postgres/pull/578
This commit is contained in:
Alexey Kondratov
2025-02-13 14:28:05 +01:00
committed by GitHub
parent e37ba8642d
commit 8c2f85b209
7 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pgxn/neon/pagestore_smgr.c
View File

@@ -3765,7 +3765,7 @@ neon_dbsize(Oid dbNode)
* neon_truncate() -- Truncate relation to specified number of blocks. * neon_truncate() -- Truncate relation to specified number of blocks.
*/ */
static void static void
neon_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks) neon_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber old_blocks, BlockNumber nblocks)
{ {
XLogRecPtr lsn; XLogRecPtr lsn;
@@ -3780,7 +3780,7 @@ neon_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
case RELPERSISTENCE_TEMP: case RELPERSISTENCE_TEMP:
case RELPERSISTENCE_UNLOGGED: case RELPERSISTENCE_UNLOGGED:
mdtruncate(reln, forknum, nblocks); mdtruncate(reln, forknum, old_blocks, nblocks);
return; return;
default: default:
@@ -3818,7 +3818,7 @@ neon_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks)
#ifdef DEBUG_COMPARE_LOCAL #ifdef DEBUG_COMPARE_LOCAL
if (IS_LOCAL_REL(reln)) if (IS_LOCAL_REL(reln))
mdtruncate(reln, forknum, nblocks); mdtruncate(reln, forknum, old_blocks, nblocks);
#endif #endif
} }

4
pgxn/neon_walredo/inmem_smgr.c
View File

@@ -96,7 +96,7 @@ static void inmem_writeback(SMgrRelation reln, ForkNumber forknum,
BlockNumber blocknum, BlockNumber nblocks); BlockNumber blocknum, BlockNumber nblocks);
static BlockNumber inmem_nblocks(SMgrRelation reln, ForkNumber forknum); static BlockNumber inmem_nblocks(SMgrRelation reln, ForkNumber forknum);
static void inmem_truncate(SMgrRelation reln, ForkNumber forknum, static void inmem_truncate(SMgrRelation reln, ForkNumber forknum,
BlockNumber nblocks); BlockNumber old_blocks, BlockNumber nblocks);
static void inmem_immedsync(SMgrRelation reln, ForkNumber forknum); static void inmem_immedsync(SMgrRelation reln, ForkNumber forknum);
#if PG_MAJORVERSION_NUM >= 17 #if PG_MAJORVERSION_NUM >= 17
static void inmem_registersync(SMgrRelation reln, ForkNumber forknum); static void inmem_registersync(SMgrRelation reln, ForkNumber forknum);
@@ -345,7 +345,7 @@ inmem_nblocks(SMgrRelation reln, ForkNumber forknum)
* inmem_truncate() -- Truncate relation to specified number of blocks. * inmem_truncate() -- Truncate relation to specified number of blocks.
*/ */
static void static void
inmem_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber nblocks) inmem_truncate(SMgrRelation reln, ForkNumber forknum, BlockNumber old_blocks, BlockNumber nblocks)
{ {
} }

2
vendor/postgres-v14 vendored

Submodule vendor/postgres-v14 updated: c0aedfd3ca...62a86dfc91

2
vendor/postgres-v15 vendored

Submodule vendor/postgres-v15 updated: 355a7c69d3...80ed91ce25

2
vendor/postgres-v16 vendored

Submodule vendor/postgres-v16 updated: 13cf5d06c9...999cf81b10

2
vendor/postgres-v17 vendored

Submodule vendor/postgres-v17 updated: 4c45d78ad5...4d3a722312

16
vendor/revisions.json vendored
View File

@@ -1,18 +1,18 @@
{ {
"v17": [ "v17": [
"17.2", "17.3",
"4c45d78ad587e4bcb4a5a7ef6931b88c6a3d575d" "4d3a722312b496ff7378156caa6d41c2e70c30e4"
], ],
"v16": [ "v16": [
"16.6", "16.7",
"13cf5d06c98a8e9b0590ce6cdfd193a08d0a7792" "999cf81b101ead40e597d5cd729458d8200f4537"
], ],
"v15": [ "v15": [
"15.10", "15.11",
"355a7c69d3f907f3612eb406cc7b9c2f55d59b59" "80ed91ce255c765d25be0bb4a02c942fe6311fbf"
], ],
"v14": [ "v14": [
"14.15", "14.16",
"c0aedfd3cac447510a2db843b561f0c52901b679" "62a86dfc91e0c35a72f2ea5e99e6969b830c0c26"
] ]
} }