more TDB

source/libs/tdb/src/db/tdbBtree.c

@@ -450,12 +450,14 @@ static int tdbBtreeBalanceDeeper(SBTree *pBt, SPage *pRoot, SPage **ppChild) {
   return 0;
 }
 
-static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, bool isRoot) {
-#if 0
-  int i;
+static int tdbBtreeBalanceNonRoot(SBTree *pBt, SPage *pParent, int idx, bool isRoot) {
+  int    nOldPages;
+  SPage *pOldPages[3];
+  int    nNewPages;
+  SPage *pNewPages[5];
+
+  // Find three or less sibling pages
 
-  i = pParent->pPageHdr->nCells + pParent->nOverFlow;
-#endif
   /* TODO */
   return 0;
 }
@@ -500,7 +502,7 @@ static int tdbBtreeBalance(SBtCursor *pCur) {
       // Generalized balance step
       pParent = pCur->pgStack[pCur->iPage - 1];
 
-      ret = tdbBtreeBalanceNonRoot(pCur->pBt, pParent, (iPage == 1));
+      ret = tdbBtreeBalanceNonRoot(pCur->pBt, pParent, pCur->idxStack[pCur->iPage - 1], (iPage == 1));
       if (ret < 0) {
         return -1;
       }

source/libs/tdb/src/db/tdbPCache.c

@@ -188,7 +188,7 @@ static void tdbPCacheUnpinPage(SPage *pPage) {
 
   tdbPCacheLock(pCache);
 
-  nRef = TDB_PAGE_REF(pPage);
+  nRef = TDB_GET_PAGE_REF(pPage);
   ASSERT(nRef >= 0);
   if (nRef == 0) {
     // Add the page to LRU list

source/libs/tdb/src/db/tdbPage.c

+/*
+ * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
+ *
+ * This program is free software: you can use, redistribute, and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3
+ * or later ("AGPL"), as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "tdbInt.h"
\ No newline at end of file

source/libs/tdb/src/inc/tdbPage.h

@@ -32,26 +32,27 @@ typedef struct SPage SPage;
 struct SPage {
   pthread_spinlock_t lock;
   // Fields below used by page cache
-  void *   pData;
+  void    *pData;
   SPgid    pgid;
   u8       isAnchor;
   u8       isLocalPage;
   u8       isDirty;
   i32      nRef;
   SPCache *pCache;
-  SPage *  pFreeNext;
-  SPage *  pHashNext;
-  SPage *  pLruNext;
-  SPage *  pLruPrev;
-  SPage *  pDirtyNext;
-  SPager * pPager;
+  SPage   *pFreeNext;
+  SPage   *pHashNext;
+  SPage   *pLruNext;
+  SPage   *pLruPrev;
+  SPage   *pDirtyNext;
+  SPager  *pPager;
   // Fields below used by pager and am
   SPageHdr *pPageHdr;
-  u16 *     aCellIdx;
+  u16      *aCellIdx;
   int       kLen;
   int       vLen;
   int       maxLocal;
   int       minLocal;
+  int       nOverflow;
 };
 
 // For page lock
@@ -76,16 +77,16 @@ struct SPage {
     ret;                                               \
   })
 
-// For page ref (TODO: Need atomic operation)
+// For page ref
 #define TDB_INIT_PAGE_REF(pPage) ((pPage)->nRef = 0)
 #if 0
 #define TDB_REF_PAGE(pPage)   (++(pPage)->nRef)
 #define TDB_UNREF_PAGE(pPage) (--(pPage)->nRef)
-#define TDB_PAGE_REF(pPage)   ((pPage)->nRef)
+#define TDB_GET_PAGE_REF(pPage)   ((pPage)->nRef)
 #else
 #define TDB_REF_PAGE(pPage)   atomic_add_fetch_32(&((pPage)->nRef), 1)
 #define TDB_UNREF_PAGE(pPage) atomic_sub_fetch_32(&((pPage)->nRef), 1)
-#define TDB_PAGE_REF(pPage)   atomic_load_32(&((pPage)->nRef))
+#define TDB_GET_PAGE_REF(pPage)   atomic_load_32(&((pPage)->nRef))
 #endif
 
 #ifdef __cplusplus