From 4cc3a55426bb5ac02dbb200ecaad58d0578ab470 Mon Sep 17 00:00:00 2001
From: Minglei Jin <mljin@taosdata.com>
Date: Fri, 7 Jul 2023 08:19:50 +0800
Subject: [PATCH] fix(tdb/recycling): delay freedb's own page recycling until
 balance done

---
 source/libs/tdb/src/db/tdbPager.c | 30 +++++++++++++++++++++++++++++-
 source/libs/tdb/src/inc/tdbInt.h  |  1 +
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c
index 469416cd1b..896b0713df 100644
--- a/source/libs/tdb/src/db/tdbPager.c
+++ b/source/libs/tdb/src/db/tdbPager.c
@@ -720,15 +720,39 @@ int tdbPagerInsertFreePage(SPager *pPager, SPage *pPage, TXN *pTxn) {
   int   code = 0;
   SPgno pgno = TDB_PAGE_PGNO(pPage);
 
+  if (pPager->frps) {
+    taosArrayPush(pPager->frps, &pgno);
+    pPage->pPager = NULL;
+    return code;
+  }
+
+  pPager->frps = taosArrayInit(8, sizeof(SPgno));
   // memset(pPage->pData, 0, pPage->pageSize);
   tdbTrace("tdb/insert-free-page: tbc recycle page: %d.", pgno);
   // printf("tdb/insert-free-page: tbc recycle page: %d.\n", pgno);
   code = tdbTbInsert(pPager->pEnv->pFreeDb, &pgno, sizeof(pgno), NULL, 0, pTxn);
   if (code < 0) {
     tdbError("tdb/insert-free-page: tb insert failed with ret: %d.", code);
+    taosArrayDestroy(pPager->frps);
+    pPager->frps = NULL;
     return -1;
   }
 
+  while (TARRAY_SIZE(pPager->frps) > 0) {
+    pgno = *(SPgno *)taosArrayPop(pPager->frps);
+
+    code = tdbTbInsert(pPager->pEnv->pFreeDb, &pgno, sizeof(pgno), NULL, 0, pTxn);
+    if (code < 0) {
+      tdbError("tdb/insert-free-page: tb insert failed with ret: %d.", code);
+      taosArrayDestroy(pPager->frps);
+      pPager->frps = NULL;
+      return -1;
+    }
+  }
+
+  taosArrayDestroy(pPager->frps);
+  pPager->frps = NULL;
+
   pPage->pPager = NULL;
 
   return code;
@@ -739,7 +763,11 @@ static int tdbPagerRemoveFreePage(SPager *pPager, SPgno *pPgno, TXN *pTxn) {
   TBC *pCur;
 
   if (!pPager->pEnv->pFreeDb) {
-    return 0;
+    return code;
+  }
+
+  if (pPager->frps) {
+    return code;
   }
 
   code = tdbTbcOpen(pPager->pEnv->pFreeDb, &pCur, pTxn);
diff --git a/source/libs/tdb/src/inc/tdbInt.h b/source/libs/tdb/src/inc/tdbInt.h
index 8defe54868..8ce294a3c6 100644
--- a/source/libs/tdb/src/inc/tdbInt.h
+++ b/source/libs/tdb/src/inc/tdbInt.h
@@ -408,6 +408,7 @@ struct SPager {
   // u8        inTran;
   TXN    *pActiveTxn;
   SArray *ofps;
+  SArray *frps;
   SPager *pNext;      // used by TDB
   SPager *pHashNext;  // used by TDB
 #ifdef USE_MAINDB
-- 
GitLab