From bad77f8e8489189fefa0e3cf435b2fae9a885611 Mon Sep 17 00:00:00 2001
From: Hongze Cheng <hzcheng@taosdata.com>
Date: Wed, 18 May 2022 12:05:39 +0000
Subject: [PATCH] refact TDB

---
 source/libs/tdb/inc/tdb.h         |  4 ++--
 source/libs/tdb/src/db/tdbDb.c    | 10 +++++-----
 source/libs/tdb/src/db/tdbTable.c |  6 +++---
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/libs/tdb/inc/tdb.h b/source/libs/tdb/inc/tdb.h
index 521b61e3c8..37d5e98c64 100644
--- a/source/libs/tdb/inc/tdb.h
+++ b/source/libs/tdb/inc/tdb.h
@@ -31,13 +31,13 @@ typedef struct STBC TBC;
 typedef struct STxn TXN;
 
 // TDB
-int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb);
+int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb);
 int tdbClose(TDB *pDb);
 int tdbBegin(TDB *pDb, TXN *pTxn);
 int tdbCommit(TDB *pDb, TXN *pTxn);
 
 // TTB
-int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb);
+int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb);
 int tdbTbClose(TTB *pTb);
 int tdbTbDrop(TTB *pTb);
 int tdbTbInsert(TTB *pTb, const void *pKey, int keyLen, const void *pVal, int valLen, TXN *pTxn);
diff --git a/source/libs/tdb/src/db/tdbDb.c b/source/libs/tdb/src/db/tdbDb.c
index 912c1ecaaf..44c945c21b 100644
--- a/source/libs/tdb/src/db/tdbDb.c
+++ b/source/libs/tdb/src/db/tdbDb.c
@@ -15,7 +15,7 @@
 
 #include "tdbInt.h"
 
-int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
+int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb) {
   TDB *pDb;
   int  dsize;
   int  zsize;
@@ -25,7 +25,7 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
 
   *ppDb = NULL;
 
-  dsize = strlen(rootDir);
+  dsize = strlen(dbname);
   zsize = sizeof(*pDb) + dsize * 2 + strlen(TDB_JOURNAL_NAME) + 3;
 
   pPtr = (uint8_t *)tdbOsCalloc(1, zsize);
@@ -37,12 +37,12 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
   pPtr += sizeof(*pDb);
   // pDb->rootDir
   pDb->rootDir = pPtr;
-  memcpy(pDb->rootDir, rootDir, dsize);
+  memcpy(pDb->rootDir, dbname, dsize);
   pDb->rootDir[dsize] = '\0';
   pPtr = pPtr + dsize + 1;
   // pDb->jfname
   pDb->jfname = pPtr;
-  memcpy(pDb->jfname, rootDir, dsize);
+  memcpy(pDb->jfname, dbname, dsize);
   pDb->jfname[dsize] = '/';
   memcpy(pDb->jfname + dsize + 1, TDB_JOURNAL_NAME, strlen(TDB_JOURNAL_NAME));
   pDb->jfname[dsize + 1 + strlen(TDB_JOURNAL_NAME)] = '\0';
@@ -62,7 +62,7 @@ int tdbOpen(const char *rootDir, int szPage, int pages, TDB **ppDb) {
   }
   memset(pDb->pgrHash, 0, tsize);
 
-  mkdir(rootDir, 0755);
+  mkdir(dbname, 0755);
 
   *ppDb = pDb;
   return 0;
diff --git a/source/libs/tdb/src/db/tdbTable.c b/source/libs/tdb/src/db/tdbTable.c
index ce7da0b471..9a8f7a2f55 100644
--- a/source/libs/tdb/src/db/tdbTable.c
+++ b/source/libs/tdb/src/db/tdbTable.c
@@ -24,7 +24,7 @@ struct STBC {
   SBTC btc;
 };
 
-int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb) {
+int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb) {
   TTB    *pTb;
   SPager *pPager;
   int     ret;
@@ -42,9 +42,9 @@ int tdbTbOpen(const char *fname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn
   // pTb->pEnv
   pTb->pEnv = pEnv;
 
-  pPager = tdbEnvGetPager(pEnv, fname);
+  pPager = tdbEnvGetPager(pEnv, tbname);
   if (pPager == NULL) {
-    snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, fname);
+    snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, tbname);
     ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager);
     if (ret < 0) {
       return -1;