From e9e338af795c1cd065e33e98d3039367a90ff43c Mon Sep 17 00:00:00 2001
From: sundechao <sundechao2@huawei.com>
Date: Thu, 6 Jun 2024 14:30:04 +0800
Subject: [PATCH] optimize undo recycle

---
 src/gausskernel/optimizer/commands/vacuum.cpp   |  2 +-
 .../storage/access/common/reloptions.cpp        |  2 +-
 .../redo/standby_read/standby_read_proc.cpp     |  6 +++++-
 .../access/ustore/undo/knl_uundorecycle.cpp     | 17 +++++++++++++----
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/gausskernel/optimizer/commands/vacuum.cpp b/src/gausskernel/optimizer/commands/vacuum.cpp
index f4bf5e92b..bc82cd65a 100644
--- a/src/gausskernel/optimizer/commands/vacuum.cpp
+++ b/src/gausskernel/optimizer/commands/vacuum.cpp
@@ -2002,7 +2002,7 @@ static bool vacuum_rel(Oid relid, VacuumStmt* vacstmt, bool do_toast)
         Relation parent_rel = try_relation_open(relationid, NoLock);
         if (parent_rel != NULL) {
             if (RelationIsUstoreFormat(parent_rel) && parent_rel->rd_rel->relhasindex) {
-                lmodePartTable = ShareLock;
+                lmodePartTable = ExclusiveLock;
             }
             relation_close(parent_rel, NoLock);
         }
diff --git a/src/gausskernel/storage/access/common/reloptions.cpp b/src/gausskernel/storage/access/common/reloptions.cpp
index 98cc0dc3d..72bbb341a 100644
--- a/src/gausskernel/storage/access/common/reloptions.cpp
+++ b/src/gausskernel/storage/access/common/reloptions.cpp
@@ -2774,7 +2774,7 @@ void ForbidOutUsersToSetInnerOptions(List *userOptions)
 void ForbidUserToSetDefinedIndexOptions(Relation rel, List *options)
 {
     /* the following option must be in tab[] of default_reloptions(). */
-    static const char *unchangedOpt[] = {"crossbucket", "storage_type"};
+    static const char *unchangedOpt[] = {"crossbucket", "storage_type", "index_txntype"};
 
     int firstInvalidOpt = -1;
     if (FindInvalidOption(options, unchangedOpt, lengthof(unchangedOpt), &firstInvalidOpt)) {
diff --git a/src/gausskernel/storage/access/redo/standby_read/standby_read_proc.cpp b/src/gausskernel/storage/access/redo/standby_read/standby_read_proc.cpp
index c4f6231ab..f10206565 100644
--- a/src/gausskernel/storage/access/redo/standby_read/standby_read_proc.cpp
+++ b/src/gausskernel/storage/access/redo/standby_read/standby_read_proc.cpp
@@ -397,7 +397,7 @@ TransactionId exrto_calculate_recycle_xmin_for_undo()
     /*
      * If there is no backend read threads, set read oldest lsn to snapshot lsn.
      */
-    if ((oldest_xmin == InvalidTransactionId) && (extreme_rto::g_dispatcher != NULL)) {
+    if (extreme_rto::g_dispatcher != NULL) {
         ExrtoSnapshot exrto_snapshot = NULL;
         exrto_snapshot = g_instance.comm_cxt.predo_cxt.exrto_snapshot;
         (void)LWLockAcquire(ExrtoSnapshotLock, LW_SHARED);
@@ -419,5 +419,9 @@ TransactionId exrto_calculate_recycle_xmin_for_undo()
     if (oldest_xmin == InvalidTransactionId) {
         return snapshot_xmin;
     }
+
+    if (TransactionIdPrecedes(snapshot_xmin, oldest_xmin)) {
+        return snapshot_xmin;
+    }
     return oldest_xmin;
 }
diff --git a/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp b/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp
index ec1da119c..e95911c5f 100755
--- a/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp
+++ b/src/gausskernel/storage/access/ustore/undo/knl_uundorecycle.cpp
@@ -270,7 +270,7 @@ void AdvanceFrozenXid(UndoZone *zone, TransactionId *oldestFozenXid,
 }
 
 bool RecycleUndoSpace(UndoZone *zone, TransactionId recycleXmin, TransactionId frozenXid,
-    TransactionId *oldestRecycleXid, TransactionId forceRecycleXid)
+    TransactionId *oldestRecycleXid, TransactionId forceRecycleXid, TransactionId oldestXmin)
 {
     UndoSlotPtr recycle = zone->GetRecycleTSlotPtr();
     UndoSlotPtr allocate = zone->GetAllocateTSlotPtr();
@@ -360,9 +360,18 @@ bool RecycleUndoSpace(UndoZone *zone, TransactionId recycleXmin, TransactionId f
                     break;
                 }
                 ereport(LOG, (errmodule(MOD_UNDO), errmsg(UNDOFORMAT("ForceRecycle: slot=%lu, slotxid=%lu, " 
-                    "recyclexid=%lu, recycleXmin=%lu, startptr=%lu, endptr=%lu."), recycle, slot->XactId(), 
+                    "recyclexid=%lu, recycleXmin=%lu, startptr=%lu, endptr=%lu, "
+                    "glovalRecycleXid=%lu, globalFrozenXid=%lu, oldestXmin=%lu, "
+                    "undoTotalSize=%u, undo_space_limit_size=%d, "
+                    "metasize=%ld, g_force_recycle_size=%d."), recycle, slot->XactId(), 
                     forceRecycleXid, recycleXmin, UNDO_PTR_GET_OFFSET(slot->StartUndoPtr()),
-                    UNDO_PTR_GET_OFFSET(slot->EndUndoPtr()))));
+                    UNDO_PTR_GET_OFFSET(slot->EndUndoPtr()),
+                    pg_atomic_read_u64(&g_instance.undo_cxt.globalRecycleXid),
+                    pg_atomic_read_u64(&g_instance.undo_cxt.globalFrozenXid),
+                    oldestXmin,
+                    pg_atomic_read_u32(&g_instance.undo_cxt.undoTotalSize),
+                    u_sess->attr.attr_storage.undo_space_limit_size,
+                    (int64)g_instance.undo_cxt.undoMetaSize, g_forceRecycleSize)));
                 forceRecycle = true;
             }
 #ifdef DEBUG_UHEAP
@@ -921,7 +930,7 @@ void UndoRecycleMain()
                             UNDOFORMAT("oldestFrozenXidInUndo: oldestFrozenXidInUndo=%lu, frozenXid=%lu"
                             " before RecycleUndoSpace"),
                             oldestFrozenXidInUndo, frozenXid)));
-                        if (RecycleUndoSpace(zone, recycleXmin, frozenXid, &recycleXid, forceRecycleXid)) {
+                        if (RecycleUndoSpace(zone, recycleXmin, frozenXid, &recycleXid, forceRecycleXid, oldestXmin)) {
                             recycled = true;
                         }
                         isAnyZoneUsed = true;