refact

include/dnode/vnode/tsdb2/tsdb.h

@@ -58,15 +58,6 @@ typedef struct SDataStatis {
 } SDataStatis;
 
 // --------- TSDB APPLICATION HANDLE DEFINITION
-typedef struct {
-  void *appH;
-  void *cqH;
-  int (*notifyStatus)(void *, int status, int eno);
-  int (*eventCallBack)(void *);
-  void *(*cqCreateFunc)(void *handle, uint64_t uid, int32_t sid, const char *dstTable, char *sqlStr, STSchema *pSchema,
-                        int start);
-  void (*cqDropFunc)(void *handle);
-} STsdbAppH;
 
 // --------- TSDB REPOSITORY CONFIGURATION DEFINITION
 typedef struct {

source/dnode/vnode/tsdb2/inc/tsdbint.h

@@ -16,22 +16,21 @@
 #ifndef _TD_TSDB_INT_H_
 #define _TD_TSDB_INT_H_
 
-
 #include "os.h"
-#include "tlog.h"
 #include "taosdef.h"
 #include "taoserror.h"
+#include "tarray.h"
 #include "tchecksum.h"
-#include "tskiplist.h"
-#include "tdataformat.h"
 #include "tcoding.h"
 #include "tcompression.h"
-#include "tlockfree.h"
-#include "tlist.h"
-#include "thash.h"
-#include "tarray.h"
+#include "tdataformat.h"
 #include "tfs.h"
+#include "thash.h"
+#include "tlist.h"
+#include "tlockfree.h"
+#include "tlog.h"
 #include "tsdbMemory.h"
+#include "tskiplist.h"
 
 #include "tsdb.h"
 
@@ -61,32 +60,15 @@ extern "C" {
 #include "tsdbRowMergeBuf.h"
 // Main definitions
 struct STsdb {
-  uint8_t state;
-
-  STsdbCfg        config;
-
-  STsdbCfg        save_config;    // save apply config
-  bool            config_changed; // config changed flag
-  pthread_mutex_t save_mutex;     // protect save config
-
-  int16_t         cacheLastConfigVersion;
-
-  STsdbAppH       appH;
-  STsdbStat       stat;
-  STsdbMeta*      tsdbMeta;
-  // STsdbBufPool*   pPool;
-  SMemTable*      mem;
-  SMemTable*      imem;
-  STsdbFS*        fs;
-  SRtn            rtn;
-  tsem_t          readyToCommit;
-  pthread_mutex_t mutex;
-  bool            repoLocked;
-  int32_t         code;  // Commit code
-
-  SMergeBuf       mergeBuf;  //used when update=2
-  int8_t          compactState;  // compact state: inCompact/noCompact/waitingCompact?
-  pthread_t*      pthread;
+  uint8_t    state;
+  STsdbCfg   config;
+  STsdbStat  stat;
+  STsdbMeta* tsdbMeta;
+  SMemTable* mem;
+  SMemTable* imem;
+  STsdbFS*   fs;
+  SRtn       rtn;
+  SMergeBuf  mergeBuf;  // used when update=2
 };
 
 #define REPO_ID(r) (r)->config.tsdbId
@@ -95,40 +77,15 @@ struct STsdb {
 #define IS_REPO_LOCKED(r) (r)->repoLocked
 #define TSDB_SUBMIT_MSG_HEAD_SIZE sizeof(SSubmitMsg)
 
-int        tsdbLockRepo(STsdb* pRepo);
-int        tsdbUnlockRepo(STsdb* pRepo);
-STsdbMeta* tsdbGetMeta(STsdb* pRepo);
-int        tsdbCheckCommit(STsdb* pRepo);
-int        tsdbRestoreInfo(STsdb* pRepo);
-UNUSED_FUNC int tsdbCacheLastData(STsdb *pRepo, STsdbCfg* oldCfg);
-int32_t    tsdbLoadLastCache(STsdb *pRepo, STable* pTable);
-void       tsdbGetRootDir(int repoid, char dirName[]);
-void       tsdbGetDataDir(int repoid, char dirName[]);
-
-// static FORCE_INLINE STsdbBufBlock* tsdbGetCurrBufBlock(STsdb* pRepo) {
-//   ASSERT(pRepo != NULL);
-//   if (pRepo->mem == NULL) return NULL;
-
-//   SListNode* pNode = listTail(pRepo->mem->bufBlockList);
-//   if (pNode == NULL) return NULL;
-
-//   STsdbBufBlock* pBufBlock = NULL;
-//   tdListNodeGetData(pRepo->mem->bufBlockList, pNode, (void*)(&pBufBlock));
-
-//   return pBufBlock;
-// }
-
-// static FORCE_INLINE int tsdbGetNextMaxTables(int tid) {
-//   ASSERT(tid >= 1 && tid <= TSDB_MAX_TABLES);
-//   int maxTables = TSDB_INIT_NTABLES;
-//   while (true) {
-//     maxTables = MIN(maxTables, TSDB_MAX_TABLES);
-//     if (tid <= maxTables) break;
-//     maxTables *= 2;
-//   }
-
-//   return maxTables + 1;
-// }
+int             tsdbLockRepo(STsdb* pRepo);
+int             tsdbUnlockRepo(STsdb* pRepo);
+STsdbMeta*      tsdbGetMeta(STsdb* pRepo);
+int             tsdbCheckCommit(STsdb* pRepo);
+int             tsdbRestoreInfo(STsdb* pRepo);
+UNUSED_FUNC int tsdbCacheLastData(STsdb* pRepo, STsdbCfg* oldCfg);
+int32_t         tsdbLoadLastCache(STsdb* pRepo, STable* pTable);
+void            tsdbGetRootDir(int repoid, char dirName[]);
+void            tsdbGetDataDir(int repoid, char dirName[]);
 
 #ifdef __cplusplus
 }