diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c
index 38c26c6126..7ed9bea44b 100644
--- a/source/libs/tdb/src/db/tdbBtree.c
+++ b/source/libs/tdb/src/db/tdbBtree.c
@@ -86,7 +86,7 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, FKeyComparator kcmpr, S
   pBt->pageSize = tdbPagerGetPageSize(pPager);
   // pBt->maxLocal
   pBt->maxLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout;
-  // pBt->minLocal
+  // pBt->minLocal: Should not be allowed smaller than 15, which is [nPayload][nKey][nData]
   pBt->minLocal = (pBt->pageSize - sizeof(SPageHdr)) / pBt->fanout / 2;
   // pBt->maxLeaf
   pBt->maxLeaf = pBt->pageSize - sizeof(SPageHdr);
diff --git a/source/libs/tdb/src/db/tdbPCache.c b/source/libs/tdb/src/db/tdbPCache.c
index b206fb8e90..fcacb40819 100644
--- a/source/libs/tdb/src/db/tdbPCache.c
+++ b/source/libs/tdb/src/db/tdbPCache.c
@@ -85,11 +85,6 @@ SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage) {
   return pPage;
 }
 
-void tdbPCacheFetchFinish(SPCache *pCache, SPage *pPage) {
-  /* TODO */
-  pPage->nRef++;  // TODO: do we need atomic operation???
-}
-
 void tdbPCacheRelease(SPage *pPage) {
   pPage->nRef--;
   if (pPage->nRef == 0) {
diff --git a/source/libs/tdb/src/inc/tdbPCache.h b/source/libs/tdb/src/inc/tdbPCache.h
index 0470c65c00..5711963238 100644
--- a/source/libs/tdb/src/inc/tdbPCache.h
+++ b/source/libs/tdb/src/inc/tdbPCache.h
@@ -23,7 +23,6 @@ extern "C" {
 int    tdbPCacheOpen(int pageSize, int cacheSize, int extraSize, SPCache **ppCache);
 int    tdbPCacheClose(SPCache *pCache);
 SPage *tdbPCacheFetch(SPCache *pCache, const SPgid *pPgid, bool alcNewPage);
-void   tdbPCacheFetchFinish(SPCache *pCache, SPage *pPage);
 void   tdbPCacheRelease(SPage *pPage);
 int    tdbPCacheGetPageSize(SPCache *pCache);
 
diff --git a/source/libs/tdb/src/inc/tdbPage.h b/source/libs/tdb/src/inc/tdbPage.h
index 419e826b48..fe2009861f 100644
--- a/source/libs/tdb/src/inc/tdbPage.h
+++ b/source/libs/tdb/src/inc/tdbPage.h
@@ -54,12 +54,19 @@ struct SPage {
   int       minLocal;
 };
 
-#define TDB_INIT_PAGE_LOCK(pPage)    pthread_spin_init(&((pPage)->lock), 0) // TODO: use the macros
+// For page lock
+#define TDB_INIT_PAGE_LOCK(pPage)    pthread_spin_init(&((pPage)->lock), 0)
 #define TDB_DESTROY_PAGE_LOCK(pPage) pthread_spin_destroy(&((pPage)->lock))
 #define TDB_LOCK_PAGE(pPage)         pthread_spin_lock(&((pPage)->lock))
 #define TDB_TRY_LOCK_PAGE(pPage)     pthread_spin_trylock(&((pPage)->lock))
 #define TDB_UNLOCK_PAGE(pPage)       pthread_spin_unlock(&((pPage)->lock))
 
+// For page ref (TODO: Need atomic operation)
+#define TDB_INIT_PAGE_REF(pPage) ((pPage)->nRef = 0)
+#define TDB_REF_PAGE(pPage)      (++(pPage)->nRef)
+#define TDB_UNREF_PAGE(pPage)    (--(pPage)->nRef)
+#define TDB_PAGE_REF(pPage)      ((pPage)->nRef)
+
 #ifdef __cplusplus
 }
 #endif