refact: tdb

source/libs/tdb/inc/tdb.h

@@ -22,7 +22,7 @@
 extern "C" {
 #endif
 
-typedef int (*tdb_cmpr_fn_t)(const void *pKey1, int kLen1, const void *pKey2, int kLen2);
+typedef int (*tdb_cmpr_fn_t)(const void *pKey1, int32_t kLen1, const void *pKey2, int32_t kLen2);
 
 // exposed types
 typedef struct STDB TDB;
@@ -31,42 +31,42 @@ typedef struct STBC TBC;
 typedef struct STxn TXN;
 
 // TDB
-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);
+int32_t tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb);
+int32_t tdbClose(TDB *pDb);
+int32_t tdbBegin(TDB *pDb, TXN *pTxn);
+int32_t tdbCommit(TDB *pDb, TXN *pTxn);
 
 // TTB
-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);
-int tdbTbDelete(TTB *pTb, const void *pKey, int kLen, TXN *pTxn);
-int tdbTbUpsert(TTB *pTb, const void *pKey, int kLen, const void *pVal, int vLen, TXN *pTxn);
-int tdbTbGet(TTB *pTb, const void *pKey, int kLen, void **ppVal, int *vLen);
-int tdbTbPGet(TTB *pTb, const void *pKey, int kLen, void **ppKey, int *pkLen, void **ppVal, int *vLen);
+int32_t tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprFn, TDB *pEnv, TTB **ppTb);
+int32_t tdbTbClose(TTB *pTb);
+int32_t tdbTbDrop(TTB *pTb);
+int32_t tdbTbInsert(TTB *pTb, const void *pKey, int keyLen, const void *pVal, int valLen, TXN *pTxn);
+int32_t tdbTbDelete(TTB *pTb, const void *pKey, int kLen, TXN *pTxn);
+int32_t tdbTbUpsert(TTB *pTb, const void *pKey, int kLen, const void *pVal, int vLen, TXN *pTxn);
+int32_t tdbTbGet(TTB *pTb, const void *pKey, int kLen, void **ppVal, int *vLen);
+int32_t tdbTbPGet(TTB *pTb, const void *pKey, int kLen, void **ppKey, int *pkLen, void **ppVal, int *vLen);
 
 // TBC
-int tdbTbcOpen(TTB *pTb, TBC **ppTbc, TXN *pTxn);
-int tdbTbcClose(TBC *pTbc);
-int tdbTbcIsValid(TBC *pTbc);
-int tdbTbcMoveTo(TBC *pTbc, const void *pKey, int kLen, int *c);
-int tdbTbcMoveToFirst(TBC *pTbc);
-int tdbTbcMoveToLast(TBC *pTbc);
-int tdbTbcMoveToNext(TBC *pTbc);
-int tdbTbcMoveToPrev(TBC *pTbc);
-int tdbTbcGet(TBC *pTbc, const void **ppKey, int *pkLen, const void **ppVal, int *pvLen);
-int tdbTbcDelete(TBC *pTbc);
-int tdbTbcNext(TBC *pTbc, void **ppKey, int *kLen, void **ppVal, int *vLen);
-int tdbTbcUpsert(TBC *pTbc, const void *pKey, int nKey, const void *pData, int nData, int insert);
+int32_t tdbTbcOpen(TTB *pTb, TBC **ppTbc, TXN *pTxn);
+int32_t tdbTbcClose(TBC *pTbc);
+int32_t tdbTbcIsValid(TBC *pTbc);
+int32_t tdbTbcMoveTo(TBC *pTbc, const void *pKey, int kLen, int *c);
+int32_t tdbTbcMoveToFirst(TBC *pTbc);
+int32_t tdbTbcMoveToLast(TBC *pTbc);
+int32_t tdbTbcMoveToNext(TBC *pTbc);
+int32_t tdbTbcMoveToPrev(TBC *pTbc);
+int32_t tdbTbcGet(TBC *pTbc, const void **ppKey, int *pkLen, const void **ppVal, int *pvLen);
+int32_t tdbTbcDelete(TBC *pTbc);
+int32_t tdbTbcNext(TBC *pTbc, void **ppKey, int *kLen, void **ppVal, int *vLen);
+int32_t tdbTbcUpsert(TBC *pTbc, const void *pKey, int nKey, const void *pData, int nData, int insert);
 
 // TXN
 #define TDB_TXN_WRITE            0x1
 #define TDB_TXN_READ_UNCOMMITTED 0x2
 
-int tdbTxnOpen(TXN *pTxn, int64_t txnid, void *(*xMalloc)(void *, size_t), void (*xFree)(void *, void *), void *xArg,
-               int flags);
-int tdbTxnClose(TXN *pTxn);
+int32_t tdbTxnOpen(TXN *pTxn, int64_t txnid, void *(*xMalloc)(void *, size_t), void (*xFree)(void *, void *),
+                   void *xArg, int flags);
+int32_t tdbTxnClose(TXN *pTxn);
 
 // other
 void tdbFree(void *);

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

@@ -15,7 +15,7 @@
 
 #include "tdbInt.h"
 
-int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb) {
+int32_t tdbOpen(const char *dbname, int32_t szPage, int32_t pages, TDB **ppDb) {
   TDB *pDb;
   int  dsize;
   int  zsize;
@@ -36,16 +36,16 @@ int tdbOpen(const char *dbname, int szPage, int pages, TDB **ppDb) {
   pDb = (TDB *)pPtr;
   pPtr += sizeof(*pDb);
   // pDb->rootDir
-  pDb->rootDir = pPtr;
-  memcpy(pDb->rootDir, dbname, dsize);
-  pDb->rootDir[dsize] = '\0';
+  pDb->dbName = pPtr;
+  memcpy(pDb->dbName, dbname, dsize);
+  pDb->dbName[dsize] = '\0';
   pPtr = pPtr + dsize + 1;
   // pDb->jfname
-  pDb->jfname = pPtr;
-  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';
+  pDb->jnName = pPtr;
+  memcpy(pDb->jnName, dbname, dsize);
+  pDb->jnName[dsize] = '/';
+  memcpy(pDb->jnName + dsize + 1, TDB_JOURNAL_NAME, strlen(TDB_JOURNAL_NAME));
+  pDb->jnName[dsize + 1 + strlen(TDB_JOURNAL_NAME)] = '\0';
 
   pDb->jfd = -1;
 

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

@@ -44,7 +44,7 @@ int tdbTbOpen(const char *tbname, int keyLen, int valLen, tdb_cmpr_fn_t keyCmprF
 
   pPager = tdbEnvGetPager(pEnv, tbname);
   if (pPager == NULL) {
-    snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->rootDir, tbname);
+    snprintf(fFullName, TDB_FILENAME_LEN, "%s/%s", pEnv->dbName, tbname);
     ret = tdbPagerOpen(pEnv->pCache, fFullName, &pPager);
     if (ret < 0) {
       return -1;

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

@@ -335,8 +335,8 @@ static inline SCell *tdbPageGetCell(SPage *pPage, int idx) {
 }
 
 struct STDB {
-  char    *rootDir;
-  char    *jfname;
+  char    *dbName;
+  char    *jnName;
   int      jfd;
   SPCache *pCache;
   SPager  *pgrList;