diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index 282c5a98a66179a260d59390e016d0c5c96e88bf..d135eedb7ca115402c6432fc78982e2600ad54e8 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -1201,24 +1201,58 @@ int tdbBtreeNext(SBTC *pBtc, void **ppKey, int *kLen, void **ppVal, int *vLen) {
 }
 
 static int tdbBtcMoveToNext(SBTC *pBtc) {
-  pBtc->idx++;
+  int    nCells;
+  SPgno  pgno;
+  SCell *pCell;
+  u8     flags;
+
+  ASSERT(TDB_BTREE_PAGE_IS_LEAF(TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage)));
 
   if (pBtc->idx < 0) return -1;
 
+  pBtc->idx++;
   if (pBtc->idx < TDB_PAGE_TOTAL_CELLS(pBtc->pPage)) {
     return 0;
   }
 
+  if (pBtc->iPage == 0) {
+    pBtc->idx = -1;
+    return 0;
+  }
+
   // Move upward
   for (;;) {
-    // TODO: release the page
+    tdbBtcMoveUpward(pBtc);
+    pBtc->idx++;
+
+    nCells = TDB_PAGE_TOTAL_CELLS(pBtc->pPage);
+    if (pBtc->idx <= nCells) {
+      break;
+    }
 
-    /* code */
+    if (pBtc->iPage == 0) {
+      pBtc->idx = -1;
+      return 0;
+    }
   }
 
   // Move downward
   for (;;) {
-    /* code */
+    nCells = TDB_PAGE_TOTAL_CELLS(pBtc->pPage);
+    if (pBtc->idx < nCells) {
+      pCell = tdbPageGetCell(pBtc->pPage, pBtc->idx);
+      pgno = *(SPgno *)pCell;
+    } else {
+      pgno = ((SIntHdr *)pBtc->pPage->pData)->pgno;
+    }
+
+    tdbBtcMoveDownward(pBtc, pgno);
+    pBtc->idx = 0;
+
+    flags = TDB_BTREE_PAGE_GET_FLAGS(pBtc->pPage);
+    if (TDB_BTREE_PAGE_IS_LEAF(flags)) {
+      break;
+    }
   }
 
   return 0;
@@ -1247,6 +1281,13 @@ static int tdbBtcMoveDownward(SBTC *pCur, SPgno pgno) {
 }
 
 static int tdbBtcMoveUpward(SBTC *pBtc) {
-  // TODO
+  if (pBtc->iPage == 0) return -1;
+
+  // tdbPagerReturnPage(pBtc->pBt->pPager, pBtc->pPage);
+
+  pBtc->iPage--;
+  pBtc->pPage = pBtc->pgStack[pBtc->iPage];
+  pBtc->idx = pBtc->idxStack[pBtc->iPage];
+
   return 0;
 }
\ No newline at end of file