make more comile

source/dnode/vnode/tsdb/CMakeLists.txt

@@ -12,7 +12,7 @@ else(0)
         "src/tsdbWrite.c"
         "src/tsdbReadImpl.c"
         "src/tsdbFile.c"
-        # "src/tsdbFS.c"
+        "src/tsdbFS.c"
     )
 endif(0)
 

source/dnode/vnode/tsdb/inc/tsdbCommit.h

@@ -29,10 +29,19 @@ typedef struct {
   int64_t  size;
 } SKVRecord;
 
+void tsdbGetRtnSnap(STsdb *pRepo, SRtn *pRtn);
+
+static FORCE_INLINE int TSDB_KEY_FID(TSKEY key, int32_t days, int8_t precision) {
+  if (key < 0) {
+    return (int)((key + 1) / tsTickPerDay[precision] / days - 1);
+  } else {
+    return (int)((key / tsTickPerDay[precision] / days));
+  }
+}
+
 #if 0
 #define TSDB_DEFAULT_BLOCK_ROWS(maxRows) ((maxRows)*4 / 5)
 
-void  tsdbGetRtnSnap(STsdbRepo *pRepo, SRtn *pRtn);
 int   tsdbEncodeKVRecord(void **buf, SKVRecord *pRecord);
 void *tsdbDecodeKVRecord(void *buf, SKVRecord *pRecord);
 void *tsdbCommitData(STsdbRepo *pRepo);

source/dnode/vnode/tsdb/inc/tsdbDef.h

@@ -27,7 +27,7 @@
 
 #include "tsdb.h"
 #include "tsdbCommit.h"
-// #include "tsdbFS.h"
+#include "tsdbFS.h"
 #include "tsdbFile.h"
 #include "tsdbLog.h"
 #include "tsdbMemTable.h"
@@ -47,12 +47,12 @@ struct STsdb {
   STsdbMemTable *       imem;
   SRtn                  rtn;
   SMemAllocatorFactory *pmaf;
-  // STsdbFS               fs;
+  STsdbFS               fs;
 };
 
 #define REPO_ID(r) 0
 #define REPO_CFG(r) (&(r)->config)
-// #define REPO_FS(r) (&(r)->fs)
+#define REPO_FS(r) (&(r)->fs)
 
 #ifdef __cplusplus
 }

source/dnode/vnode/tsdb/src/tsdbCommit.c

@@ -32,6 +32,23 @@ int tsdbCommit(STsdb *pTsdb) {
   return 0;
 }
 
+void tsdbGetRtnSnap(STsdb *pRepo, SRtn *pRtn) {
+  STsdbCfg *pCfg = REPO_CFG(pRepo);
+  TSKEY     minKey, midKey, maxKey, now;
+
+  now = taosGetTimestamp(pCfg->precision);
+  minKey = now - pCfg->keep * tsTickPerDay[pCfg->precision];
+  midKey = now - pCfg->keep2 * tsTickPerDay[pCfg->precision];
+  maxKey = now - pCfg->keep1 * tsTickPerDay[pCfg->precision];
+
+  pRtn->minKey = minKey;
+  pRtn->minFid = (int)(TSDB_KEY_FID(minKey, pCfg->daysPerFile, pCfg->precision));
+  pRtn->midFid = (int)(TSDB_KEY_FID(midKey, pCfg->daysPerFile, pCfg->precision));
+  pRtn->maxFid = (int)(TSDB_KEY_FID(maxKey, pCfg->daysPerFile, pCfg->precision));
+  tsdbDebug("vgId:%d now:%" PRId64 " minKey:%" PRId64 " minFid:%d, midFid:%d, maxFid:%d", REPO_ID(pRepo), now, minKey,
+            pRtn->minFid, pRtn->midFid, pRtn->maxFid);
+}
+
 #if 0
 /*
  * Copyright (c) 2019 TAOS Data, Inc. <jhtao@taosdata.com>
@@ -420,23 +437,6 @@ void *tsdbDecodeKVRecord(void *buf, SKVRecord *pRecord) {
   return buf;
 }
 
-void tsdbGetRtnSnap(STsdbRepo *pRepo, SRtn *pRtn) {
-  STsdbCfg *pCfg = REPO_CFG(pRepo);
-  TSKEY     minKey, midKey, maxKey, now;
-
-  now = taosGetTimestamp(pCfg->precision);
-  minKey = now - pCfg->keep * tsTickPerDay[pCfg->precision];
-  midKey = now - pCfg->keep2 * tsTickPerDay[pCfg->precision];
-  maxKey = now - pCfg->keep1 * tsTickPerDay[pCfg->precision];
-
-  pRtn->minKey = minKey;
-  pRtn->minFid = (int)(TSDB_KEY_FID(minKey, pCfg->daysPerFile, pCfg->precision));
-  pRtn->midFid = (int)(TSDB_KEY_FID(midKey, pCfg->daysPerFile, pCfg->precision));
-  pRtn->maxFid = (int)(TSDB_KEY_FID(maxKey, pCfg->daysPerFile, pCfg->precision));
-  tsdbDebug("vgId:%d now:%" PRId64 " minKey:%" PRId64 " minFid:%d, midFid:%d, maxFid:%d", REPO_ID(pRepo), now, minKey,
-            pRtn->minFid, pRtn->midFid, pRtn->maxFid);
-}
-
 static int tsdbUpdateMetaRecord(STsdbFS *pfs, SMFile *pMFile, uint64_t uid, void *cont, int contLen, bool compact) {
   char      buf[64] = "\0";
   void *    pBuf = buf;

source/dnode/vnode/tsdb/src/tsdbMemTable.c

@@ -335,7 +335,7 @@ static int tsdbTbDataComp(const void *arg1, const void *arg2) {
 
 static char *tsdbTbDataGetUid(const void *arg) {
   STbData *pTbData = (STbData *)arg;
-  return &(pTbData->uid);
+  return (char *)(&(pTbData->uid));
 }
 
 /* ------------------------ REFACTORING ------------------------ */