From 6e834c151ab187974440ed6a559d1ea4aeb50063 Mon Sep 17 00:00:00 2001 From: wofanzheng <2399541971@qq.com> Date: Fri, 20 Sep 2024 15:15:56 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=9B=9E=E6=94=BE=E6=97=A5?= =?UTF-8?q?=E5=BF=97=E6=89=93=E5=8D=B0=E5=8A=A0=E5=9B=BA=E7=9A=84=E5=91=8A?= =?UTF-8?q?=E8=AD=A6=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/include/access/heapam.h | 20 ++++++++++---------- src/include/access/ustore/knl_upage.h | 4 ++-- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/include/access/heapam.h b/src/include/access/heapam.h index ff7c84a08..ac3b5f364 100644 --- a/src/include/access/heapam.h +++ b/src/include/access/heapam.h @@ -189,16 +189,16 @@ static const struct { #define ConditionalLockTupleTuplock(_rel, _tup, _mode) \ ConditionalLockTuple((_rel), (_tup), TupleLockExtraInfo[_mode].hwlock) -#define PagePrintErrorInfo(_page, _msg) \ - do { \ - PageHeader pageHeader = (PageHeader)page; \ - elog(PANIC, \ - "%s, PageHeaderInfo: pd_lsn:%X/%X, pd_checksum:%u, pd_flags:%u, " \ - "pd_lower:%u, pd_upper:%u, pd_special:%u, pd_pagesize_version:%u, pd_prune_xid:%u", \ - _msg, pageHeader->pd_lsn.xlogid, \ - ((uint64)pageHeader->pd_lsn.xlogid << XLOG_UHEAP_LSN_HIGH_OFF) + pageHeader->pd_lsn.xrecoff, \ - pageHeader->pd_checksum, pageHeader->pd_flags, pageHeader->pd_lower, pageHeader->pd_upper, \ - pageHeader->pd_special, pageHeader->pd_pagesize_version, pageHeader->pd_prune_xid); \ +#define PagePrintErrorInfo(_page, _msg) \ + do { \ + PageHeader pageHeader = (PageHeader)page; \ + elog(PANIC, \ + "%s, PageHeaderInfo: pd_lsn:%X/%X, pd_checksum:%u, pd_flags:%u, " \ + "pd_lower:%u, pd_upper:%u, pd_special:%u, pd_pagesize_version:%u, pd_prune_xid:%u", \ + _msg, pageHeader->pd_lsn.xlogid, \ + (uint32)(((uint64)pageHeader->pd_lsn.xlogid << XLOG_LSN_HIGH_OFF) | pageHeader->pd_lsn.xrecoff), \ + pageHeader->pd_checksum, pageHeader->pd_flags, pageHeader->pd_lower, pageHeader->pd_upper, \ + pageHeader->pd_special, pageHeader->pd_pagesize_version, pageHeader->pd_prune_xid); \ } while (0) /* * This table maps tuple lock strength values for each particular diff --git a/src/include/access/ustore/knl_upage.h b/src/include/access/ustore/knl_upage.h index a8e8f79ff..cca10b82d 100644 --- a/src/include/access/ustore/knl_upage.h +++ b/src/include/access/ustore/knl_upage.h @@ -34,7 +34,7 @@ #define UHP_ALL_VISIBLE 0x0004 /* all tuples on page are visible to \ * everyone */ #define UHEAP_VALID_FLAG_BITS 0xFFFF /* OR of all valid flag bits */ -#define XLOG_UHEAP_LSN_HIGH_OFF 32 +#define XLOG_LSN_HIGH_OFF 32 #define UPageHasFreeLinePointers(_page) (((UHeapPageHeaderData *)(_page))->pd_flags & UHEAP_HAS_FREE_LINES) #define UPageSetHasFreeLinePointers(_page) (((UHeapPageHeaderData *)(_page))->pd_flags |= UHEAP_HAS_FREE_LINES) @@ -217,7 +217,7 @@ "pd_upper:%u, pd_special:%u, pd_pagesize_version:%u, potential_freespace:%u, td_count:%u, " \ "pd_prune_xid:%lu, pd_xid_base:%lu, pd_multi_base:%lu", \ _msg, pageHeader->pd_lsn.xlogid, \ - ((uint64)pageHeader->pd_lsn.xlogid << XLOG_UHEAP_LSN_HIGH_OFF) + pageHeader->pd_lsn.xrecoff, \ + (uint32)(((uint64)pageHeader->pd_lsn.xlogid << XLOG_LSN_HIGH_OFF) | pageHeader->pd_lsn.xrecoff), \ pageHeader->pd_checksum, pageHeader->pd_flags, pageHeader->pd_lower, pageHeader->pd_upper, \ pageHeader->pd_special, pageHeader->pd_pagesize_version, pageHeader->potential_freespace, \ pageHeader->td_count, pageHeader->pd_prune_xid, pageHeader->pd_xid_base, pageHeader->pd_multi_base); \