Merge pull request #22772 from taosdata/fix/TD-25996-main

fix/TD-25996: tdbBtcDelete release pages before modifying pBtc->pPage
taosdata · Sep 6, 2023 · 42d63be · 42d63be
2 parents e493f98 + 7257518
commit 42d63be
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
@@ -2200,10 +2200,15 @@ int tdbBtcDelete(SBTC *pBtc) {
           tdbOsFree(pCell);
 
           if (pPage->nOverflow > 0) {
-            tdbDebug("tdb/btc-delete: btree balance after update cell, pPage/nOverflow: %p/%d.", pPage,
-                     pPage->nOverflow);
+            tdbDebug("tdb/btc-delete: btree balance after update cell, pPage/nOverflow/pgno: %p/%d/%" PRIu32 ".", pPage,
+                     pPage->nOverflow, TDB_PAGE_PGNO(pPage));
 
-            pBtc->iPage = iPage;
+            tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pPage, pBtc->pTxn);
+            while (--pBtc->iPage != iPage) {
+              tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pgStack[pBtc->iPage], pBtc->pTxn);
+            }
+
+            // pBtc->iPage = iPage;
             pBtc->pPage = pPage;
             ret = tdbBtreeBalance(pBtc);
             if (ret < 0) {

diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c
@@ -295,7 +295,7 @@ static SPage *tdbPCacheFetchImpl(SPCache *pCache, const SPgid *pPgid, TXN *pTxn)
   }
 
   // 1. pPage == NULL
-  // 2. pPage && pPage->isLocal == 0 && !TDB_TXN_IS_WRITE(pTxn)
+  // 2. pPage && !pPage->isLocal == 0 && !TDB_TXN_IS_WRITE(pTxn)
   pPageH = pPage;
   pPage = NULL;