From 50a863746451ec909344e6279fa295a4e0f62605 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 28 Feb 2022 06:13:13 +0000 Subject: [PATCH] more --- source/libs/tdb/src/db/tdbBtree.c | 2 +- source/libs/tdb/src/db/tdbDb.c | 8 ++++++++ source/libs/tdb/src/inc/tdbBtree.h | 2 ++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/source/libs/tdb/src/db/tdbBtree.c b/source/libs/tdb/src/db/tdbBtree.c index 3c079b1b26..11c293af74 100644 --- a/source/libs/tdb/src/db/tdbBtree.c +++ b/source/libs/tdb/src/db/tdbBtree.c @@ -63,7 +63,7 @@ static int tdbBtCursorMoveToRoot(SBtCursor *pCur); static int tdbInitBtPage(SPage *pPage, SBtPage **ppBtPage); static int tdbCompareKeyAndCell(const void *pKey, int kLen, const void *pCell); -int tdbBtreeOpen(SPgno root, SBTree **ppBt) { +int tdbBtreeOpen(SBTree **ppBt) { *ppBt = NULL; /* TODO */ return 0; diff --git a/source/libs/tdb/src/db/tdbDb.c b/source/libs/tdb/src/db/tdbDb.c index e5c6e19163..a0c9939ad9 100644 --- a/source/libs/tdb/src/db/tdbDb.c +++ b/source/libs/tdb/src/db/tdbDb.c @@ -23,6 +23,7 @@ struct STDb { int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, STDb **ppDb) { STDb * pDb; SPFile *pFile; + int ret; *ppDb = NULL; @@ -31,8 +32,15 @@ int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprF return -1; } + // pDb->pEnv pDb->pEnv = pEnv; + // pDb->pBt + ret = tdbBtreeOpen(&(pDb->pBt)); + if (ret < 0) { + return -1; + } + *ppDb = pDb; return 0; } diff --git a/source/libs/tdb/src/inc/tdbBtree.h b/source/libs/tdb/src/inc/tdbBtree.h index a2890b4cd4..0961ac1664 100644 --- a/source/libs/tdb/src/inc/tdbBtree.h +++ b/source/libs/tdb/src/inc/tdbBtree.h @@ -23,6 +23,8 @@ extern "C" { typedef struct SBTree SBTree; typedef struct SBtCursor SBtCursor; +int tdbBtreeOpen(SBTree **ppBt); +int tdbBtreeClose(SBTree *pBt); int tdbBtCursorInsert(SBtCursor *pCur, const void *pKey, int kLen, const void *pVal, int vLen); #ifdef __cplusplus -- GitLab