This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 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 39837ea7422 Fix compile errors for rmgrdesc
39837ea7422 is described below
commit 39837ea74224773cbc7ba66ebfbbd1ba29d1a24d
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Sep 30 23:12:07 2025 +0800
Fix compile errors for rmgrdesc
---
src/backend/access/nbtree/nbtree.c | 4 +++-
src/backend/access/rmgrdesc/appendonlydesc.c | 8 +++----
src/backend/access/rmgrdesc/bitmapdesc.c | 4 ++--
src/backend/access/rmgrdesc/xactdesc.c | 34 +++++-----------------------
src/backend/access/transam/xact.c | 4 ++--
src/include/access/xact.h | 1 -
src/include/replication/syncrep.h | 1 +
7 files changed, 18 insertions(+), 38 deletions(-)
diff --git a/src/backend/access/nbtree/nbtree.c
b/src/backend/access/nbtree/nbtree.c
index efa2d376e0b..3ad1c7ea0d8 100644
--- a/src/backend/access/nbtree/nbtree.c
+++ b/src/backend/access/nbtree/nbtree.c
@@ -166,9 +166,11 @@ btbuildempty(Relation index)
* when the index is large, but for an empty index, it's better to use
the
* buffer cache to avoid the smgrimmedsync().
*/
+
+ metabuf = ReadBufferExtended(index, INIT_FORKNUM, P_NEW, RBM_NORMAL,
NULL);
+ metapage = BufferGetPage(metabuf);
PageEncryptInplace(metapage, INIT_FORKNUM,
BTREE_METAPAGE);
- metabuf = ReadBufferExtended(index, INIT_FORKNUM, P_NEW, RBM_NORMAL,
NULL);
Assert(BufferGetBlockNumber(metabuf) == BTREE_METAPAGE);
_bt_lockbuf(index, metabuf, BT_WRITE);
diff --git a/src/backend/access/rmgrdesc/appendonlydesc.c
b/src/backend/access/rmgrdesc/appendonlydesc.c
index 67e1d23808a..871c056abeb 100644
--- a/src/backend/access/rmgrdesc/appendonlydesc.c
+++ b/src/backend/access/rmgrdesc/appendonlydesc.c
@@ -32,8 +32,8 @@ appendonly_desc(StringInfo buf, XLogReaderState *record)
appendStringInfo(
buf,
"insert: rel %u/%u/%u seg/offset:%u/"
INT64_FORMAT " len:%lu",
- xlrec->target.node.spcNode,
xlrec->target.node.dbNode,
- xlrec->target.node.relNode,
xlrec->target.segment_filenum,
+ xlrec->target.node.spcOid,
xlrec->target.node.dbOid,
+ xlrec->target.node.relNumber,
xlrec->target.segment_filenum,
xlrec->target.offset,
XLogRecGetDataLen(record) - SizeOfAOInsert);
}
break;
@@ -44,8 +44,8 @@ appendonly_desc(StringInfo buf, XLogReaderState *record)
appendStringInfo(
buf,
"truncate: rel %u/%u/%u seg/offset:%u/"
INT64_FORMAT,
- xlrec->target.node.spcNode,
xlrec->target.node.dbNode,
- xlrec->target.node.relNode,
xlrec->target.segment_filenum,
+ xlrec->target.node.spcOid,
xlrec->target.node.dbOid,
+ xlrec->target.node.relNumber,
xlrec->target.segment_filenum,
xlrec->target.offset);
}
break;
diff --git a/src/backend/access/rmgrdesc/bitmapdesc.c
b/src/backend/access/rmgrdesc/bitmapdesc.c
index d6920b99313..a23c44cee87 100644
--- a/src/backend/access/rmgrdesc/bitmapdesc.c
+++ b/src/backend/access/rmgrdesc/bitmapdesc.c
@@ -20,10 +20,10 @@
#include "storage/relfilenode.h"
static void
-out_target(StringInfo buf, RelFileNode *node)
+out_target(StringInfo buf, RelFileLocator *node)
{
appendStringInfo(buf, ", rel %u/%u/%u",
- node->spcNode, node->dbNode, node->relNode);
+ node->spcOid, node->dbOid, node->relNumber);
}
void
diff --git a/src/backend/access/rmgrdesc/xactdesc.c
b/src/backend/access/rmgrdesc/xactdesc.c
index 072421406e2..37d0d21aeec 100644
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@ -203,7 +203,7 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec,
xl_xact_parsed_abort *parsed)
xl_xact_relfilelocators *xl_rellocator =
(xl_xact_relfilelocators *) data;
parsed->nrels = xl_rellocator->nrels;
- parsed->xlocators = xl_rellocator->xlocators;
+ parsed->xnodes = xl_rellocator->xlocators;
data += MinSizeOfXactRelfileLocators;
data += xl_rellocator->nrels * sizeof(RelFileNodePendingDelete);
@@ -291,11 +291,11 @@ ParsePrepareRecord(uint8 info, xl_xact_prepare *xlrec,
xl_xact_parsed_prepare *p
parsed->subxacts = (TransactionId *) bufptr;
bufptr += MAXALIGN(xlrec->nsubxacts * sizeof(TransactionId));
- parsed->xlocators = (RelFileLocator *) bufptr;
- bufptr += MAXALIGN(xlrec->ncommitrels * sizeof(RelFileLocator));
+ parsed->xlocators = (RelFileNodePendingDelete *) bufptr;
+ bufptr += MAXALIGN(xlrec->ncommitrels *
sizeof(RelFileNodePendingDelete));
- parsed->abortlocators = (RelFileLocator *) bufptr;
- bufptr += MAXALIGN(xlrec->nabortrels * sizeof(RelFileLocator));
+ parsed->abortlocators = (RelFileNodePendingDelete *) bufptr;
+ bufptr += MAXALIGN(xlrec->nabortrels *
sizeof(RelFileNodePendingDelete));
parsed->stats = (xl_xact_stats_item *) bufptr;
bufptr += MAXALIGN(xlrec->ncommitstats * sizeof(xl_xact_stats_item));
@@ -448,7 +448,7 @@ xact_desc_abort(StringInfo buf, uint8 info, xl_xact_abort
*xlrec, RepOriginId or
appendStringInfoString(buf, timestamptz_to_str(xlrec->xact_time));
- xact_desc_relations(buf, "rels", parsed.nrels, parsed.xlocators);
+ xact_desc_relations(buf, "rels", parsed.nrels, parsed.xnodes);
xact_desc_subxacts(buf, parsed.nsubxacts, parsed.subxacts);
if (parsed.xinfo & XACT_XINFO_HAS_ORIGIN)
@@ -521,28 +521,6 @@ xact_desc_assignment(StringInfo buf, xl_xact_assignment
*xlrec)
appendStringInfo(buf, " %u", xlrec->xsub[i]);
}
-static void
-xact_desc_prepare(StringInfo buf, uint8 info, TwoPhaseFileHeader *tpfh)
-{
- const char *gid;
- Assert(info == XLOG_XACT_PREPARE);
-
- appendStringInfo(buf, "at = %s", timestamptz_to_str(tpfh->prepared_at));
-
- if (tpfh->gidlen > 0)
- {
- gid = (const char *)tpfh + MAXALIGN(sizeof(*tpfh));
- Assert(strlen(gid) == (tpfh->gidlen -1));
-
- appendStringInfo(buf, "; gid = %*s", tpfh->gidlen - 1, gid);
- }
-
- if (tpfh->tablespace_oid_to_delete_on_commit != InvalidOid)
- appendStringInfo(buf, "; tablespace_oid_to_delete_on_commit =
%u", tpfh->tablespace_oid_to_delete_on_commit);
- if (tpfh->tablespace_oid_to_delete_on_abort != InvalidOid)
- appendStringInfo(buf, "; tablespace_oid_to_delete_on_abort =
%u", tpfh->tablespace_oid_to_delete_on_abort);
-}
-
void
xact_desc(StringInfo buf, XLogReaderState *record)
{
diff --git a/src/backend/access/transam/xact.c
b/src/backend/access/transam/xact.c
index f38f4907044..2086edea458 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -2112,7 +2112,6 @@ RecordTransactionAbort(bool isSubXact)
* rels to delete (note that this routine is not responsible for
actually
* deleting 'em). We cannot have any child XIDs, either.
*/
- SetCurrentTransactionStopTimestamp();
if (!TransactionIdIsValid(xid))
{
/* Reset XactLastRecEnd until the next transaction writes
something */
@@ -2215,7 +2214,7 @@ RecordTransactionAbort(bool isSubXact)
XactLastRecEnd = 0;
if (max_wal_senders > 0)
- WalSndWakeup();
+ WalSndWakeup(true, true);
/* And clean up local data */
if (rels)
@@ -7194,6 +7193,7 @@ XactLogAbortRecord(TimestampTz abort_time,
xl_xact_twophase xl_twophase;
xl_xact_dbinfo xl_dbinfo;
xl_xact_origin xl_origin;
+ xl_xact_relfilelocators xl_relfilelocators;
uint8 info;
diff --git a/src/include/access/xact.h b/src/include/access/xact.h
index 2dbff2d709d..7d66b2c0e31 100644
--- a/src/include/access/xact.h
+++ b/src/include/access/xact.h
@@ -463,7 +463,6 @@ typedef struct xl_xact_parsed_abort
int ndeldbs;
DbDirNode *deldbs;
- RelFileLocator *xlocators;
int nstats;
xl_xact_stats_item *stats;
diff --git a/src/include/replication/syncrep.h
b/src/include/replication/syncrep.h
index d638eddfa13..a8741e6545f 100644
--- a/src/include/replication/syncrep.h
+++ b/src/include/replication/syncrep.h
@@ -14,6 +14,7 @@
#define _SYNCREP_H
#include "access/xlogdefs.h"
+#include "utils/guc.h"
#define SyncRepRequested() \
(max_wal_senders > 0 && synchronous_commit >
SYNCHRONOUS_COMMIT_LOCAL_FLUSH)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
