From c816f795cd65a28c4b98688fa7b8f310f53deb95 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Sat, 16 Jul 2022 17:27:29 +0800 Subject: [PATCH 1/5] fix/tdb: first round multi-db implementation --- source/libs/tdb/src/db/tdbBtree.c | 42 +++++++++++++++++++++-- source/libs/tdb/src/db/tdbDb.c | 14 +++++++- source/libs/tdb/src/db/tdbTable.c | 56 ++++++++++++++++++++++++++++--- source/libs/tdb/src/inc/tdbInt.h | 15 ++++++++- 4 files changed, 118 insertions(+), 9 deletions(-) diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c index 3768eef7c9..deef60354e 100644 --- a/source/libs/tdb/src/db/tdbBtree.c +++ b/source/libs/tdb/src/db/tdbBtree.c @@ -67,7 +67,8 @@ static int tdbBtreeCellSize(const SPage *pPage, SCell *pCell, int dropOfp, TXN * static int tdbBtcMoveDownward(SBTC *pBtc); static int tdbBtcMoveUpward(SBTC *pBtc); -int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, tdb_cmpr_fn_t kcmpr, SBTree **ppBt) { +int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, char const *tbname, SPgno pgno, tdb_cmpr_fn_t kcmpr, + SBTree **ppBt) { SBTree *pBt; int ret; @@ -99,13 +100,49 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, tdb_cmpr_fn_t kcmpr, SB // pBt->minLeaf pBt->minLeaf = pBt->minLocal; + // if pgno == 0 fetch new btree root leaf page + if (pgno == 0) { + // fetch page & insert into main db + // allocate a new child page + SPage *pPage; + TXN txn; + tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, 0); + + pPager->inTran = 1; + + SBtreeInitPageArg zArg; + zArg.flags = 0x1 | 0x2; // root leaf node; + zArg.pBt = pBt; + ret = tdbPagerFetchPage(pPager, &pgno, &pPage, tdbBtreeInitPage, &zArg, &txn); + if (ret < 0) { + return -1; + } + + // TODO: Need to zero the page + + ret = tdbPagerWrite(pPager, pPage); + if (ret < 0) { + return -1; + } + if (strcmp(TDB_MAINDB_NAME, tbname)) { + ret = tdbTbInsert(pPager->pEnv->pMainDb, tbname, strlen(tbname) + 1, &pgno, sizeof(SPgno), &txn); + if (ret < 0) { + return -1; + } + } + tdbTxnClose(&txn); + } + + ASSERT(pgno != 0); + pBt->root = pgno; + /* // TODO: pBt->root ret = tdbBtreeOpenImpl(pBt); if (ret < 0) { tdbOsFree(pBt); return -1; } - + */ *ppBt = pBt; return 0; } @@ -338,7 +375,6 @@ static int tdbBtreeOpenImpl(SBTree *pBt) { ASSERT(pgno != 0); pBt->root = pgno; - return 0; } diff --git a/source/libs/tdb/src/db/tdbDb.c b/source/libs/tdb/src/db/tdbDb.c index 186217878b..298992a560 100644 --- a/source/libs/tdb/src/db/tdbDb.c +++ b/source/libs/tdb/src/db/tdbDb.c @@ -64,6 +64,14 @@ int32_t tdbOpen(const char *dbname, int32_t szPage, int32_t pages, TDB **ppDb) { mkdir(dbname, 0755); +#ifdef USE_MAINDB + // open main db + ret = tdbTbOpen(TDB_MAINDB_NAME, -1, sizeof(SPgno), NULL, pDb, &pDb->pMainDb); + if (ret < 0) { + return -1; + } +#endif + *ppDb = pDb; return 0; } @@ -72,6 +80,10 @@ int tdbClose(TDB *pDb) { SPager *pPager; if (pDb) { +#ifdef USE_MAINDB + if (pDb->pMainDb) tdbTbClose(pDb->pMainDb); +#endif + for (pPager = pDb->pgrList; pPager; pPager = pDb->pgrList) { pDb->pgrList = pPager->pNext; tdbPagerClose(pPager); @@ -179,4 +191,4 @@ void tdbEnvRemovePager(TDB *pDb, SPager *pPager) { if (pDb->nPgrHash > 8 && pDb->nPager < pDb->nPgrHash / 2) { // TODO } -} \ No newline at end of file +} diff --git a/source/libs/tdb/src/db/tdbTable.c b/source/libs/tdb/src/db/tdbTable.c index f1bfb4eabc..380baefb46 100644 --- a/source/libs/tdb/src/db/tdbTable.c +++ b/source/libs/tdb/src/db/tdbTable.c @@ -16,7 +16,7 @@ #include "tdbInt.h" struct STTB { - TDB * pEnv; + TDB *pEnv; SBTree *pBt; }; @@ -25,12 +25,16 @@ struct STBC { }; int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb) { - TTB * pTb; + TTB *pTb; SPager *pPager; int ret; char fFullName[TDB_FILENAME_LEN]; - SPage * pPage; + SPage *pPage; SPgno pgno; + void *pKey = NULL; + int nKey = 0; + void *pData = NULL; + int nData = 0; *ppTb = NULL; @@ -42,6 +46,48 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF // pTb->pEnv pTb->pEnv = pEnv; +#ifdef USE_MAINDB + snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->dbName, TDB_MAINDB_NAME); + + if (strcmp(TDB_MAINDB_NAME, tbname)) { + pPager = tdbEnvGetPager(pEnv, fFullName); + if (!pPager) { + return -1; + } + + ret = tdbTbGet(pPager->pEnv->pMainDb, tbname, strlen(tbname) + 1, &pData, &nData); + if (ret < 0) { + // new pgno & insert into main db + pgno = 0; + } else { + pgno = *(SPgno *)pData; + + tdbFree(pKey); + tdbFree(pData); + } + + } else { + pPager = tdbEnvGetPager(pEnv, fFullName); + if (pPager == NULL) { + ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager); + if (ret < 0) { + return -1; + } + + tdbEnvAddPager(pEnv, pPager); + + pPager->pEnv = pEnv; + } + + if (pPager->dbOrigSize > 0) { + pgno = 1; + } else { + pgno = 0; + } + } + +#else + pPager = tdbEnvGetPager(pEnv, tbname); if (pPager == NULL) { snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->dbName, tbname); @@ -53,10 +99,12 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF tdbEnvAddPager(pEnv, pPager); } +#endif + ASSERT(pPager != NULL); // pTb->pBt - ret = tdbBtreeOpen(keyLen, valLen, pPager, keyCmprFn, &(pTb->pBt)); + ret = tdbBtreeOpen(keyLen, valLen, pPager, tbname, pgno, keyCmprFn, &(pTb->pBt)); if (ret < 0) { return -1; } diff --git a/source/libs/tdb/src/inc/tdbInt.h b/source/libs/tdb/src/inc/tdbInt.h index 2713a12af3..1f38cea038 100644 --- a/source/libs/tdb/src/inc/tdbInt.h +++ b/source/libs/tdb/src/inc/tdbInt.h @@ -150,7 +150,8 @@ struct SBTC { }; // SBTree -int tdbBtreeOpen(int keyLen, int valLen, SPager *pFile, tdb_cmpr_fn_t kcmpr, SBTree **ppBt); +int tdbBtreeOpen(int keyLen, int valLen, SPager *pFile, char const *tbname, SPgno pgno, tdb_cmpr_fn_t kcmpr, + SBTree **ppBt); int tdbBtreeClose(SBTree *pBt); int tdbBtreeInsert(SBTree *pBt, const void *pKey, int kLen, const void *pVal, int vLen, TXN *pTxn); int tdbBtreeDelete(SBTree *pBt, const void *pKey, int kLen, TXN *pTxn); @@ -356,6 +357,12 @@ static inline SCell *tdbPageGetCell(SPage *pPage, int idx) { return pCell; } +#define USE_MAINDB + +#ifdef USE_MAINDB +#define TDB_MAINDB_NAME "main.tdb" +#endif + struct STDB { char *dbName; char *jnName; @@ -365,6 +372,9 @@ struct STDB { int nPager; int nPgrHash; SPager **pgrHash; +#ifdef USE_MAINDB + TTB *pMainDb; +#endif }; struct SPager { @@ -381,6 +391,9 @@ struct SPager { u8 inTran; SPager *pNext; // used by TDB SPager *pHashNext; // used by TDB +#ifdef USE_MAINDB + TDB *pEnv; +#endif }; #ifdef __cplusplus From c6b2b2f98a629f768a455341d5f84c373d395488 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Sat, 16 Jul 2022 19:37:17 +0800 Subject: [PATCH 2/5] fix: return 0 if page's already dirty --- source/libs/tdb/src/db/tdbPager.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c index 60eaf467ae..516804cad9 100644 --- a/source/libs/tdb/src/db/tdbPager.c +++ b/source/libs/tdb/src/db/tdbPager.c @@ -174,6 +174,13 @@ int tdbPagerWrite(SPager *pPager, SPage *pPage) { for (ppPage = &pPager->pDirty; (*ppPage) && TDB_PAGE_PGNO(*ppPage) < TDB_PAGE_PGNO(pPage); ppPage = &((*ppPage)->pDirtyNext)) { } + + if (*ppPage && TDB_PAGE_PGNO(*ppPage) == TDB_PAGE_PGNO(pPage)) { + tdbUnrefPage(pPage); + + return 0; + } + ASSERT(*ppPage == NULL || TDB_PAGE_PGNO(*ppPage) > TDB_PAGE_PGNO(pPage)); pPage->pDirtyNext = *ppPage; *ppPage = pPage; From 24e40fcc39629e3de3b13e25b013ee8ad11d30b1 Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Sun, 17 Jul 2022 00:14:36 +0800 Subject: [PATCH 3/5] fix memory issue --- source/libs/tdb/src/db/tdbBtree.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c index deef60354e..8d7a2e1be6 100644 --- a/source/libs/tdb/src/db/tdbBtree.c +++ b/source/libs/tdb/src/db/tdbBtree.c @@ -124,12 +124,16 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, char const *tbname, SPg if (ret < 0) { return -1; } + if (strcmp(TDB_MAINDB_NAME, tbname)) { ret = tdbTbInsert(pPager->pEnv->pMainDb, tbname, strlen(tbname) + 1, &pgno, sizeof(SPgno), &txn); if (ret < 0) { return -1; } } + + tdbUnrefPage(pPage); + tdbCommit(pPager->pEnv, &txn); tdbTxnClose(&txn); } From 5548f47eb87b975f33a134421fda9c1328218da1 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Sun, 17 Jul 2022 14:13:43 +0800 Subject: [PATCH 4/5] chore: update libtaos ws submodule for3.0 (#14999) * chore: add libtaos-ws for 3.0 * chore: update taosws-rs * chore: add libtaosws to install/remove script * chore: update taosws-rs * chore: update taosws-rs * chore: update taos-tools, taosws-rs for 3.0 * fix: packaging/tools/make_install.sh for 3.0 * chore: update taos-tools * chore: fix release script for 3.0 * chore: update taosws-rs for 3.0 * chore: add taows-rs submodule for 3.0 * chore: update taosws-rs for 3.0 --- tools/taosws-rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/taosws-rs b/tools/taosws-rs index 7a94ffab45..c5fded266d 160000 --- a/tools/taosws-rs +++ b/tools/taosws-rs @@ -1 +1 @@ -Subproject commit 7a94ffab45f08e16f09b3f430fe75d717054adb6 +Subproject commit c5fded266d3b10508e38bf3285bb7ecf798bc343 From 73e91f649196e86c4e0c3b1c155a9d735594f97b Mon Sep 17 00:00:00 2001 From: Minglei Jin Date: Sun, 17 Jul 2022 14:27:13 +0800 Subject: [PATCH 5/5] fix wal kill case --- source/libs/tdb/src/db/tdbBtree.c | 3 ++- source/libs/tdb/src/db/tdbPager.c | 15 ++++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c index 8d7a2e1be6..cca451ceb7 100644 --- a/source/libs/tdb/src/db/tdbBtree.c +++ b/source/libs/tdb/src/db/tdbBtree.c @@ -132,7 +132,8 @@ int tdbBtreeOpen(int keyLen, int valLen, SPager *pPager, char const *tbname, SPg } } - tdbUnrefPage(pPage); + // tdbUnrefPage(pPage); + tdbPCacheRelease(pPager->pCache, pPage, &txn); tdbCommit(pPager->pEnv, &txn); tdbTxnClose(&txn); } diff --git a/source/libs/tdb/src/db/tdbPager.c b/source/libs/tdb/src/db/tdbPager.c index 516804cad9..e7765ed667 100644 --- a/source/libs/tdb/src/db/tdbPager.c +++ b/source/libs/tdb/src/db/tdbPager.c @@ -474,7 +474,7 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) { } TXN txn; - tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, 0); + tdbTxnOpen(&txn, 0, tdbDefaultMalloc, tdbDefaultFree, NULL, TDB_TXN_WRITE | TDB_TXN_READ_UNCOMMITTED); SBtreeInitPageArg iArg; iArg.pBt = pBt; iArg.flags = 0; @@ -494,6 +494,7 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) { return -1; } + /* ret = tdbPagerFetchPage(pPager, &pgno, &pPage, tdbBtreeInitPage, &iArg, &txn); if (ret < 0) { return -1; @@ -506,6 +507,18 @@ int tdbPagerRestore(SPager *pPager, SBTree *pBt) { } tdbPCacheRelease(pPager->pCache, pPage, &txn); + */ + i64 offset = pPager->pageSize * (pgno - 1); + if (tdbOsLSeek(pPager->fd, offset, SEEK_SET) < 0) { + ASSERT(0); + return -1; + } + + ret = tdbOsWrite(pPager->fd, pageBuf, pPager->pageSize); + if (ret < 0) { + ASSERT(0); + return -1; + } } tdbOsFSync(pPager->fd);