From c99ad28d43a355b841efd0e464104cc6907791e2 Mon Sep 17 00:00:00 2001 From: wuyuechuan Date: Fri, 7 Aug 2020 15:10:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=B6=E8=A1=8C=E5=9B=9E=E6=94=BE/=E6=9E=81?= =?UTF-8?q?=E8=87=B4rto=E6=97=A5=E5=BF=97=E7=B1=BB=E5=9E=8B=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../storage/access/transam/extreme_rto/dispatcher.cpp | 6 +++++- .../storage/access/transam/parallel_recovery/dispatcher.cpp | 3 +-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp b/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp index 3b7e0db57..6843795af 100644 --- a/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp +++ b/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp @@ -150,9 +150,13 @@ static const RmgrDispatchData g_dispatchTable[RM_MAX_ID + 1] = { RmgrRecordInfoValid, RM_MULTIXACT_ID, XLOG_MULTIXACT_ZERO_OFF_PAGE, - XLOG_MULTIXACT_CREATE_ID}, + XLOG_MULTIXACT_INT64_PAGENO}, {DispatchRelMapRecord, RmgrRecordInfoValid, RM_RELMAP_ID, XLOG_RELMAP_UPDATE, XLOG_RELMAP_UPDATE}, +#ifndef ENABLE_MULTIPLE_NODES + {DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN_ABORTED}, +#else {DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN}, +#endif {DispatchHeap2Record, RmgrRecordInfoValid, RM_HEAP2_ID, XLOG_HEAP2_FREEZE, XLOG_HEAP2_LOGICAL_NEWPAGE}, {DispatchHeapRecord, RmgrRecordInfoValid, RM_HEAP_ID, XLOG_HEAP_INSERT, XLOG_HEAP_INPLACE}, {DispatchBtreeRecord, RmgrRecordInfoValid, RM_BTREE_ID, XLOG_BTREE_INSERT_LEAF, XLOG_BTREE_REUSE_PAGE}, diff --git a/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp b/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp index c56a21a88..4a532b080 100755 --- a/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp +++ b/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp @@ -155,14 +155,13 @@ static const RmgrDispatchData g_dispatchTable[RM_MAX_ID + 1] = { RmgrRecordInfoValid, RM_MULTIXACT_ID, XLOG_MULTIXACT_ZERO_OFF_PAGE, - XLOG_MULTIXACT_CREATE_ID}, + XLOG_MULTIXACT_INT64_PAGENO}, {DispatchRelMapRecord, RmgrRecordInfoValid, RM_RELMAP_ID, XLOG_RELMAP_UPDATE, XLOG_RELMAP_UPDATE}, #ifdef ENABLE_MULTIPLE_NODES {DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN}, #else {DispatchStandbyRecord, RmgrRecordInfoValid, RM_STANDBY_ID, XLOG_STANDBY_LOCK, XLOG_STANDBY_CSN_ABORTED}, #endif - {DispatchHeap2Record, RmgrRecordInfoValid, RM_HEAP2_ID, XLOG_HEAP2_FREEZE, XLOG_HEAP2_LOGICAL_NEWPAGE}, {DispatchHeapRecord, RmgrRecordInfoValid, RM_HEAP_ID, XLOG_HEAP_INSERT, XLOG_HEAP_INPLACE}, {DispatchBtreeRecord, RmgrRecordInfoValid, RM_BTREE_ID, XLOG_BTREE_INSERT_LEAF, XLOG_BTREE_REUSE_PAGE},