This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new ae9bc2e5356 Fix pg_prewarm compile-time issues
ae9bc2e5356 is described below
commit ae9bc2e5356afe3ceeae3cce4da82eeaffafaf43
Author: reshke <[email protected]>
AuthorDate: Sun Dec 14 15:55:12 2025 +0000
Fix pg_prewarm compile-time issues
Resolved issue with relfilenumber/relfilenode
---
contrib/pg_prewarm/autoprewarm.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/contrib/pg_prewarm/autoprewarm.c b/contrib/pg_prewarm/autoprewarm.c
index 13ef2727db5..5462d364107 100644
--- a/contrib/pg_prewarm/autoprewarm.c
+++ b/contrib/pg_prewarm/autoprewarm.c
@@ -62,11 +62,7 @@ typedef struct BlockInfoRecord
{
Oid database;
Oid tablespace;
-<<<<<<< HEAD
- Oid filenode;
-=======
RelFileNumber filenumber;
->>>>>>> REL_16_9
ForkNumber forknum;
BlockNumber blocknum;
} BlockInfoRecord;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
