From 8b5d3175af3a21afbce824eea9e5b9f5e492135f Mon Sep 17 00:00:00 2001
From: lanchunyi <57934792@qq.com>
Date: Thu, 5 Aug 2021 10:28:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dfd=E6=B3=84=E6=BC=8F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../access/transam/extreme_rto/dispatcher.cpp | 19 +++----------------
 .../transam/parallel_recovery/dispatcher.cpp  | 19 +++----------------
 2 files changed, 6 insertions(+), 32 deletions(-)

diff --git a/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp b/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp
index 462d6894b..d7f21bc44 100644
--- a/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp
+++ b/src/gausskernel/storage/access/transam/extreme_rto/dispatcher.cpp
@@ -860,23 +860,10 @@ static bool DispatchRelMapRecord(XLogReaderState *record, List *expectedTLIs, Ti
 static bool DispatchXactRecord(XLogReaderState *record, List *expectedTLIs, TimestampTz recordXTime)
 {
     if (XactWillRemoveRelFiles(record)) {
-        /* for parallel performance */
-        if (SUPPORT_FPAGE_DISPATCH) {
-            int nrels = 0;
-            ColFileNodeRel *xnodes = NULL;
-            XactGetRelFiles(record, &xnodes, &nrels);
-            for (int i = 0; ((i < nrels) && (xnodes != NULL)); ++i) {
-                ColFileNode node;
-                ColFileNodeRel *nodeRel = xnodes + i;
-                ColFileNodeCopy(&node, nodeRel);
-                uint32 id = GetSlotId(node.filenode, 0, 0, GetBatchCount());
-                AddSlotToPLSet(id);
-            }
-        } else {
-            for (uint32 i = 0; i < g_dispatcher->pageLineNum; i++) {
-                AddSlotToPLSet(i);
-            }
+        for (uint32 i = 0; i < g_dispatcher->pageLineNum; i++) {
+            AddSlotToPLSet(i);
         }
+
         /* sync with trxn thread */
         /* trx execute drop action, pageworker forger invalid page,
          * pageworker first exe and update lastcomplateLSN
diff --git a/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp b/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp
index 935dec338..284ba4109 100644
--- a/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp
+++ b/src/gausskernel/storage/access/transam/parallel_recovery/dispatcher.cpp
@@ -722,23 +722,10 @@ static bool DispatchRelMapRecord(XLogReaderState *record, List *expectedTLIs, Ti
 static bool DispatchXactRecord(XLogReaderState *record, List *expectedTLIs, TimestampTz recordXTime)
 {
     if (XactWillRemoveRelFiles(record)) {
-        /* for parallel performance */
-        if (SUPPORT_FPAGE_DISPATCH) {
-            int nrels = 0;
-            ColFileNodeRel *xnodes = NULL;
-            XactGetRelFiles(record, &xnodes, &nrels);
-            for (int i = 0; ((i < nrels) && (xnodes != NULL)); ++i) {
-                ColFileNode node;
-                ColFileNodeRel *nodeRel = xnodes + i;
-                ColFileNodeCopy(&node, nodeRel);
-                uint32 id = GetWorkerId(node.filenode, 0, 0);
-                AddWorkerToSet(id);
-            }
-        } else {
-            for (uint32 i = 0; i < g_dispatcher->pageWorkerCount; i++) {
-                AddWorkerToSet(i);
-            }
+        for (uint32 i = 0; i < g_dispatcher->pageWorkerCount; i++) {
+            AddWorkerToSet(i);
         }
+
         /* sync with trxn thread */
         /* trx execute drop action, pageworker forger invalid page,
          * pageworker first exe and update lastcomplateLSN