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 c9e100c626a Fix merge error for XactLogAbortRecord
c9e100c626a is described below
commit c9e100c626a142d2228562af8374a4903d140bfe
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Dec 17 23:08:02 2025 +0800
Fix merge error for XactLogAbortRecord
---
src/backend/access/rmgrdesc/xactdesc.c | 22 +++++++++++-----------
src/backend/access/transam/xact.c | 7 +++----
2 files changed, 14 insertions(+), 15 deletions(-)
diff --git a/src/backend/access/rmgrdesc/xactdesc.c
b/src/backend/access/rmgrdesc/xactdesc.c
index 37d0d21aeec..19df1db24dc 100644
--- a/src/backend/access/rmgrdesc/xactdesc.c
+++ b/src/backend/access/rmgrdesc/xactdesc.c
@@ -209,17 +209,6 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec,
xl_xact_parsed_abort *parsed)
data += xl_rellocator->nrels * sizeof(RelFileNodePendingDelete);
}
- if (parsed->xinfo & XACT_XINFO_HAS_DELDBS)
- {
- xl_xact_deldbs *xl_deldbs = (xl_xact_deldbs *) data;
-
- parsed->ndeldbs = xl_deldbs->ndeldbs;
- parsed->deldbs = xl_deldbs->deldbs;
-
- data += MinSizeOfXactDelDbs;
- data += xl_deldbs->ndeldbs * sizeof(DbDirNode);
- }
-
if (parsed->xinfo & XACT_XINFO_HAS_DROPPED_STATS)
{
xl_xact_stats_items *xl_drops = (xl_xact_stats_items *) data;
@@ -231,6 +220,17 @@ ParseAbortRecord(uint8 info, xl_xact_abort *xlrec,
xl_xact_parsed_abort *parsed)
data += xl_drops->nitems * sizeof(xl_xact_stats_item);
}
+ if (parsed->xinfo & XACT_XINFO_HAS_DELDBS)
+ {
+ xl_xact_deldbs *xl_deldbs = (xl_xact_deldbs *) data;
+
+ parsed->ndeldbs = xl_deldbs->ndeldbs;
+ parsed->deldbs = xl_deldbs->deldbs;
+
+ data += MinSizeOfXactDelDbs;
+ data += xl_deldbs->ndeldbs * sizeof(DbDirNode);
+ }
+
if (parsed->xinfo & XACT_XINFO_HAS_TWOPHASE)
{
xl_xact_twophase *xl_twophase = (xl_xact_twophase *) data;
diff --git a/src/backend/access/transam/xact.c
b/src/backend/access/transam/xact.c
index cb12173b1ce..387bb64960e 100644
--- a/src/backend/access/transam/xact.c
+++ b/src/backend/access/transam/xact.c
@@ -7180,13 +7180,12 @@ XactLogAbortRecord(TimestampTz abort_time,
xl_xact_abort xlrec;
xl_xact_xinfo xl_xinfo;
xl_xact_subxacts xl_subxacts;
- xl_xact_relfilenodes xl_relfilenodes;
- xl_xact_deldbs xl_deldbs;
+ xl_xact_relfilelocators xl_relfilelocators;
xl_xact_stats_items xl_dropped_stats;
xl_xact_twophase xl_twophase;
xl_xact_dbinfo xl_dbinfo;
xl_xact_origin xl_origin;
- xl_xact_relfilelocators xl_relfilelocators;
+ xl_xact_deldbs xl_deldbs;
uint8 info;
@@ -7218,7 +7217,7 @@ XactLogAbortRecord(TimestampTz abort_time,
if (nrels > 0)
{
xl_xinfo.xinfo |= XACT_XINFO_HAS_RELFILELOCATORS;
- xl_relfilenodes.nrels = nrels;
+ xl_relfilelocators.nrels = nrels;
info |= XLR_SPECIAL_REL_UPDATE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
