From 09833d2244a0da316a34d3b342513d55fc2a8753 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 23 Mar 2022 08:21:09 +0000
Subject: [PATCH] more TDB

---
 source/libs/tdb/src/db/tdbBtree.c | 45 ++++++++++++++++++++-----------
 1 file changed, 30 insertions(+), 15 deletions(-)

diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index c6270d6047..ca50631e90 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -710,28 +710,43 @@ static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, int idx) {
         if (nNewCells < infoNews[iNew].cnt) {
           tdbPageInsertCell(pNews[iNew], nNewCells, pCell, szCell, 0);
           nNewCells++;
-        } else {
-          if (childNotLeaf) {
-            // Insert to parent
 
-            // set current new page right-most child
-            ((SIntHdr *)pNews[iNew]->pData)->pgno = ((SPgno *)pCell)[0];
+          // insert parent page
+          if (!childNotLeaf && nNewCells == infoNews[iNew].cnt) {
+            SIntHdr *pIntHdr = (SIntHdr *)pParent->pData;
+
+            if (iNew == nNews - 1 && pIntHdr->pgno == 0) {
+              pIntHdr->pgno = TDB_PAGE_PGNO(pNews[iNew]);
+            } else {
+              // TODO:
+              ((SPgno *)pCell)[0] = TDB_PAGE_PGNO(pNews[iNew]);
+              // TODO: pCell here may be inserted as an overflow cell, handle it
+              tdbPageInsertCell(pParent, sIdx++, pCell, szCell, 0);
+            }
 
             // move to next new page
             iNew++;
-            nNewCells = 0;
-          } else {
-            // TODO: Insert to parent max key and current page number or the right most child
+            nNews = 0;
+          }
+        } else {
+          ASSERT(childNotLeaf);
 
-            // move to next new page
-            iNew++;
-            nNewCells = 0;
+          // set current new page right-most child
+          ((SIntHdr *)pNews[iNew]->pData)->pgno = ((SPgno *)pCell)[0];
+
+          // insert to parent as divider cell
+          SIntHdr *pIntHdr = (SIntHdr *)pParent->pData;
 
-            // insert the cell to the new page
-            ASSERT(nNewCells < infoNews[iNew].cnt);
-            tdbPageInsertCell(pNews[iNew], nNewCells, pCell, szCell, 0);
-            nNewCells++;
+          if (iNew == nNews - 1 && pIntHdr->pgno == 0) {
+            pIntHdr->pgno = TDB_PAGE_PGNO(pNews[iNew]);
+          } else {
+            ((SPgno *)pCell)[0] = TDB_PAGE_PGNO(pNews[iNew]);
+            tdbPageInsertCell(pParent, sIdx++, pCell, szCell, 0);
           }
+
+          // move to next new page
+          iNew++;
+          nNewCells = 0;
         }
       }
     }
-- 
GitLab