Merge branch 'feature/tdb' of https://github.com/taosdata/TDengine into feature/meta

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

@@ -16,7 +16,7 @@
 #include "tdbInt.h"
 
 struct STDB {
-  STEnv  *pEnv;
+  TEnv   *pEnv;
   SBTree *pBt;
 };
 
@@ -24,7 +24,7 @@ struct STDBC {
   SBTC btc;
 };
 
-int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, TDB **ppDb) {
+int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, TEnv *pEnv, TDB **ppDb) {
   TDB    *pDb;
   SPager *pPager;
   int     ret;

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

@@ -15,12 +15,12 @@
 
 #include "tdbInt.h"
 
-int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv) {
-  STEnv *pEnv;
-  int    dsize;
-  int    zsize;
-  u8    *pPtr;
-  int    ret;
+int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TEnv **ppEnv) {
+  TEnv *pEnv;
+  int   dsize;
+  int   zsize;
+  u8   *pPtr;
+  int   ret;
 
   *ppEnv = NULL;
 
@@ -32,7 +32,7 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv)
     return -1;
   }
 
-  pEnv = (STEnv *)pPtr;
+  pEnv = (TEnv *)pPtr;
   pPtr += sizeof(*pEnv);
   // pEnv->rootDir
   pEnv->rootDir = pPtr;
@@ -59,12 +59,12 @@ int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv)
   return 0;
 }
 
-int tdbEnvClose(STEnv *pEnv) {
+int tdbEnvClose(TEnv *pEnv) {
   // TODO
   return 0;
 }
 
-SPager *tdbEnvGetPager(STEnv *pEnv, const char *fname) {
+SPager *tdbEnvGetPager(TEnv *pEnv, const char *fname) {
   // TODO
   return NULL;
 }
\ No newline at end of file

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

@@ -15,17 +15,17 @@
 
 #include "tdbInt.h"
 
-int tdbTxnBegin(STEnv *pEnv) {
+int tdbTxnBegin(TEnv *pEnv) {
   // TODO
   return 0;
 }
 
-int tdbTxnCommit(STEnv *pEnv) {
+int tdbTxnCommit(TEnv *pEnv) {
   // TODO
   return 0;
 }
 
-int tdbTxnRollback(STEnv *pEnv) {
+int tdbTxnRollback(TEnv *pEnv) {
   // TODO
   return 0;
 }
\ No newline at end of file

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

@@ -24,7 +24,7 @@ typedef struct STDB  TDB;
 typedef struct STDBC TDBC;
 
 // TDB
-int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, STEnv *pEnv, TDB **ppDb);
+int tdbDbOpen(const char *fname, int keyLen, int valLen, FKeyComparator keyCmprFn, TEnv *pEnv, TDB **ppDb);
 int tdbDbClose(TDB *pDb);
 int tdbDbDrop(TDB *pDb);
 int tdbDbInsert(TDB *pDb, const void *pKey, int keyLen, const void *pVal, int valLen);

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

@@ -21,16 +21,16 @@ extern "C" {
 #endif
 
 typedef struct STEnv {
-  char *   rootDir;
-  char *   jfname;
+  char    *rootDir;
+  char    *jfname;
   int      jfd;
   SPCache *pCache;
-} STEnv;
+} TEnv;
 
-int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, STEnv **ppEnv);
-int tdbEnvClose(STEnv *pEnv);
+int tdbEnvOpen(const char *rootDir, int pageSize, int cacheSize, TEnv **ppEnv);
+int tdbEnvClose(TEnv *pEnv);
 
-SPager *tdbEnvGetPager(STEnv *pEnv, const char *fname);
+SPager *tdbEnvGetPager(TEnv *pEnv, const char *fname);
 
 #ifdef __cplusplus
 }

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

@@ -28,9 +28,9 @@ struct STxn {
   void *xArg;
 };
 
-int tdbTxnBegin(STEnv *pEnv);
-int tdbTxnCommit(STEnv *pEnv);
-int tdbTxnRollback(STEnv *pEnv);
+int tdbTxnBegin(TEnv *pEnv);
+int tdbTxnCommit(TEnv *pEnv);
+int tdbTxnRollback(TEnv *pEnv);
 
 #ifdef __cplusplus
 }

source/libs/tdb/test/tdbTest.cpp

@@ -115,7 +115,7 @@ static int tDefaultKeyCmpr(const void *pKey1, int keyLen1, const void *pKey2, in
 
 TEST(tdb_test, simple_test) {
   int            ret;
-  STEnv         *pEnv;
+  TEnv          *pEnv;
   TDB           *pDb;
   FKeyComparator compFunc;
   int            nData = 1000000;