tsdb2: adapt cache with tsdb2 API

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

@@ -368,20 +368,20 @@ typedef struct {
 } SCacheFlushState;
 
 struct STsdb {
-  char            *path;
-  SVnode          *pVnode;
-  STsdbKeepCfg     keepCfg;
-  TdThreadRwlock   rwLock;
-  SMemTable       *mem;
-  SMemTable       *imem;
-  STsdbFS          fs;    // old
-  SLRUCache       *lruCache;
-  SCacheFlushState flushState;
-  TdThreadMutex    lruMutex;
-  SLRUCache       *biCache;
-  TdThreadMutex    biMutex;
+  char                *path;
+  SVnode              *pVnode;
+  STsdbKeepCfg         keepCfg;
+  TdThreadRwlock       rwLock;
+  SMemTable           *mem;
+  SMemTable           *imem;
+  STsdbFS              fs;  // old
+  SLRUCache           *lruCache;
+  SCacheFlushState     flushState;
+  TdThreadMutex        lruMutex;
+  SLRUCache           *biCache;
+  TdThreadMutex        biMutex;
   struct STFileSystem *pFS;  // new
-  SRocksCache      rCache;
+  SRocksCache          rCache;
 };
 
 struct TSDBKEY {
@@ -659,12 +659,19 @@ struct SDelFWriter {
   uint8_t *aBuf[1];
 };
 
+#include "tarray2.h"
+//#include "tsdbFS2.h"
+// struct STFileSet;
+typedef struct STFileSet STFileSet;
+typedef TARRAY2(STFileSet *) TFileSetArray;
+
 struct STsdbReadSnap {
-  SMemTable  *pMem;
-  SQueryNode *pNode;
-  SMemTable  *pIMem;
-  SQueryNode *pINode;
-  STsdbFS     fs;
+  SMemTable     *pMem;
+  SQueryNode    *pNode;
+  SMemTable     *pIMem;
+  SQueryNode    *pINode;
+  TFileSetArray *pfSetArray;
+  STsdbFS        fs;
 };
 
 struct SDataFWriter {
@@ -777,7 +784,7 @@ struct SDiskDataBuilder {
 typedef struct SLDataIter {
   SRBTreeNode            node;
   SSttBlk               *pSttBlk;
-  int32_t                iStt;       // for debug purpose
+  int32_t                iStt;  // for debug purpose
   int8_t                 backward;
   int32_t                iSttBlk;
   int32_t                iRow;
@@ -796,22 +803,22 @@ int32_t tMergeTreeOpen(SMergeTree *pMTree, int8_t backward, SDataFReader *pFRead
                        bool destroyLoadInfo, const char *idStr, bool strictTimeRange, SLDataIter *pLDataIter);
 
 typedef struct {
-  int8_t         backward;
-  STsdb         *pTsdb;
-  uint64_t       suid;
-  uint64_t       uid;
-  STimeWindow    timewindow;
-  SVersionRange  verRange;
-  bool           strictTimeRange;
-  SArray        *pSttFileBlockIterArray;
-  void          *pCurrentFileset;
-  STSchema      *pSchema;
-  int16_t       *pCols;
-  int32_t        numOfCols;
-  void          *pReader;
-  void          *idstr;
+  int8_t        backward;
+  STsdb        *pTsdb;
+  uint64_t      suid;
+  uint64_t      uid;
+  STimeWindow   timewindow;
+  SVersionRange verRange;
+  bool          strictTimeRange;
+  SArray       *pSttFileBlockIterArray;
+  void         *pCurrentFileset;
+  STSchema     *pSchema;
+  int16_t      *pCols;
+  int32_t       numOfCols;
+  void         *pReader;
+  void         *idstr;
 } SMergeTreeConf;
-int32_t tMergeTreeOpen2(SMergeTree *pMTree, SMergeTreeConf* pConf);
+int32_t tMergeTreeOpen2(SMergeTree *pMTree, SMergeTreeConf *pConf);
 
 void tMergeTreeAddIter(SMergeTree *pMTree, SLDataIter *pIter);
 bool tMergeTreeNext(SMergeTree *pMTree);
@@ -827,29 +834,28 @@ void              *destroySttBlockReader(SArray *pLDataIterArray, int64_t *block
 
 // tsdbCache ==============================================================================================
 typedef struct SCacheRowsReader {
-  STsdb             *pTsdb;
-  SVersionRange      verRange;
-  TdThreadMutex      readerMutex;
-  SVnode            *pVnode;
-  STSchema          *pSchema;
-  STSchema          *pCurrSchema;
-  uint64_t           uid;
-  uint64_t           suid;
-  char             **transferBuf;  // todo remove it soon
-  int32_t            numOfCols;
-  SArray            *pCidList;
-  int32_t           *pSlotIds;
-  int32_t            type;
-  int32_t            tableIndex;  // currently returned result tables
-  STableKeyInfo     *pTableList;  // table id list
-  int32_t            numOfTables;
-  SSttBlockLoadInfo *pLoadInfo;
-  SLDataIter        *pDataIter;
-  STsdbReadSnap     *pReadSnap;
-  SDataFReader      *pDataFReader;
-  SDataFReader      *pDataFReaderLast;
-  const char        *idstr;
-  int64_t            lastTs;
+  STsdb         *pTsdb;
+  SVersionRange  verRange;
+  TdThreadMutex  readerMutex;
+  SVnode        *pVnode;
+  STSchema      *pSchema;
+  STSchema      *pCurrSchema;
+  uint64_t       uid;
+  uint64_t       suid;
+  char         **transferBuf;  // todo remove it soon
+  int32_t        numOfCols;
+  SArray        *pCidList;
+  int32_t       *pSlotIds;
+  int32_t        type;
+  int32_t        tableIndex;  // currently returned result tables
+  STableKeyInfo *pTableList;  // table id list
+  int32_t        numOfTables;
+  SArray        *pLDataIterArray;
+  STsdbReadSnap *pReadSnap;
+  SDataFReader  *pDataFReader;
+  SDataFReader  *pDataFReaderLast;
+  char          *idstr;
+  int64_t        lastTs;
 } SCacheRowsReader;
 
 typedef struct {

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

@@ -124,7 +124,10 @@ int32_t tsdbReuseCacherowsReader(void* reader, void* pTableIdList, int32_t numOf
   pReader->numOfTables = numOfTables;
   pReader->lastTs = INT64_MIN;
 
-  resetLastBlockLoadInfo(pReader->pLoadInfo);
+  int64_t blocks;
+  double  elapse;
+  pReader->pLDataIterArray = destroySttBlockReader(pReader->pLDataIterArray, &blocks, &elapse);
+  pReader->pLDataIterArray = taosArrayInit(4, POINTER_BYTES);
 
   return TSDB_CODE_SUCCESS;
 }
@@ -178,14 +181,8 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,
 
   SVnodeCfg* pCfg = &((SVnode*)pVnode)->config;
   int32_t    numOfStt = pCfg->sttTrigger;
-  p->pLoadInfo = tCreateLastBlockLoadInfo(p->pSchema, NULL, 0, numOfStt);
-  if (p->pLoadInfo == NULL) {
-    tsdbCacherowsReaderClose(p);
-    return TSDB_CODE_OUT_OF_MEMORY;
-  }
-
-  p->pDataIter = taosMemoryCalloc(pCfg->sttTrigger, sizeof(SLDataIter));
-  if (p->pDataIter == NULL) {
+  p->pLDataIterArray = taosArrayInit(4, POINTER_BYTES);
+  if (p->pLDataIterArray == NULL) {
     tsdbCacherowsReaderClose(p);
     return TSDB_CODE_OUT_OF_MEMORY;
   }
@@ -214,10 +211,11 @@ void* tsdbCacherowsReaderClose(void* pReader) {
     taosMemoryFree(p->pSchema);
   }
 
-  taosMemoryFree(p->pDataIter);
   taosMemoryFree(p->pCurrSchema);
 
-  destroyLastBlockLoadInfo(p->pLoadInfo);
+  int64_t loadBlocks = 0;
+  double  elapse = 0;
+  destroySttBlockReader(p->pLDataIterArray, &loadBlocks, &elapse);
 
   taosMemoryFree((void*)p->idstr);
   taosThreadMutexDestroy(&p->readerMutex);
@@ -298,7 +296,7 @@ int32_t tsdbRetrieveCacheRows(void* pReader, SSDataBlock* pResBlock, const int32
   }
 
   taosThreadMutexLock(&pr->readerMutex);
-  code = tsdbTakeReadSnap((STsdbReader*)pr, tsdbCacheQueryReseek, &pr->pReadSnap);
+  code = tsdbTakeReadSnap2((STsdbReader*)pr, tsdbCacheQueryReseek, &pr->pReadSnap);
   if (code != TSDB_CODE_SUCCESS) {
     goto _end;
   }
@@ -427,8 +425,12 @@ _end:
   tsdbDataFReaderClose(&pr->pDataFReaderLast);
   tsdbDataFReaderClose(&pr->pDataFReader);
 
-  resetLastBlockLoadInfo(pr->pLoadInfo);
-  tsdbUntakeReadSnap((STsdbReader*)pr, pr->pReadSnap, true);
+  int64_t loadBlocks = 0;
+  double  elapse = 0;
+  pr->pLDataIterArray = destroySttBlockReader(pr->pLDataIterArray, &loadBlocks, &elapse);
+  pr->pLDataIterArray = taosArrayInit(4, POINTER_BYTES);
+
+  tsdbUntakeReadSnap2((STsdbReader*)pr, pr->pReadSnap, true);
   taosThreadMutexUnlock(&pr->readerMutex);
 
   if (pRes != NULL) {

source/dnode/vnode/src/tsdb/tsdbFS2.h

@@ -25,7 +25,7 @@ extern "C" {
 /* Exposed Handle */
 typedef struct STFileSystem STFileSystem;
 typedef struct STFSBgTask   STFSBgTask;
-typedef TARRAY2(STFileSet *) TFileSetArray;
+// typedef TARRAY2(STFileSet *) TFileSetArray;
 
 typedef enum {
   TSDB_FEDIT_COMMIT = 1,  //
@@ -107,4 +107,4 @@ struct STFileSystem {
 }
 #endif
 
-#endif /*_TSDB_FILE_SYSTEM_H*/
\ No newline at end of file
+#endif /*_TSDB_FILE_SYSTEM_H*/

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

@@ -18,9 +18,9 @@
 #include "tsdbDataFileRW.h"
 #include "tsdbFS2.h"
 #include "tsdbMerge.h"
+#include "tsdbReadUtil.h"
 #include "tsdbUtil2.h"
 #include "tsimplehash.h"
-#include "tsdbReadUtil.h"
 
 #define ASCENDING_TRAVERSE(o)        (o == TSDB_ORDER_ASC)
 #define getCurrentKeyInLastBlock(_r) ((_r)->currentKey)
@@ -100,7 +100,7 @@ static int32_t updateBlockSMAInfo(STSchema* pSchema, SBlockLoadSuppInfo* pSupInf
 
       i += 1;
       j += 1;
-    } else if (pTCol->colId < pSupInfo->colId[j]) { // do nothing
+    } else if (pTCol->colId < pSupInfo->colId[j]) {  // do nothing
       i += 1;
     } else {
       return TSDB_CODE_INVALID_PARA;
@@ -3815,7 +3815,7 @@ static int32_t doOpenReaderImpl(STsdbReader* pReader) {
   SReaderStatus*  pStatus = &pReader->status;
   SDataBlockIter* pBlockIter = &pStatus->blockIter;
 
-  initFilesetIterator(&pStatus->fileIter, pReader->status.pfSetArray, pReader);
+  initFilesetIterator(&pStatus->fileIter, pReader->pReadSnap->pfSetArray, pReader);
   resetDataBlockIterator(&pStatus->blockIter, pReader->info.order);
 
   int32_t code = TSDB_CODE_SUCCESS;
@@ -3842,7 +3842,6 @@ static void freeSchemaFunc(void* param) {
 static void clearSharedPtr(STsdbReader* p) {
   p->status.pTableMap = NULL;
   p->status.uidList.tableUidList = NULL;
-  p->status.pfSetArray = NULL;
   p->info.pSchema = NULL;
   p->pReadSnap = NULL;
   p->pSchemaMap = NULL;
@@ -3851,7 +3850,8 @@ static void clearSharedPtr(STsdbReader* p) {
 static void setSharedPtr(STsdbReader* pDst, const STsdbReader* pSrc) {
   pDst->status.pTableMap = pSrc->status.pTableMap;
   pDst->status.uidList = pSrc->status.uidList;
-  pDst->status.pfSetArray = pSrc->status.pfSetArray;
+  // pDst->status.pfSetArray = pSrc->status.pfSetArray;
+  pDst->pReadSnap->pfSetArray = pSrc->pReadSnap->pfSetArray;
   pDst->info.pSchema = pSrc->info.pSchema;
   pDst->pSchemaMap = pSrc->pSchemaMap;
   pDst->pReadSnap = pSrc->pReadSnap;
@@ -4633,7 +4633,7 @@ int32_t tsdbReaderReset2(STsdbReader* pReader, SQueryTableDataCond* pCond) {
 
   int32_t numOfTables = tSimpleHashGetSize(pStatus->pTableMap);
 
-  initFilesetIterator(&pStatus->fileIter, pReader->status.pfSetArray, pReader);
+  initFilesetIterator(&pStatus->fileIter, pReader->pReadSnap->pfSetArray, pReader);
   resetDataBlockIterator(pBlockIter, pReader->info.order);
   resetTableListIndex(&pReader->status);
 
@@ -4886,7 +4886,7 @@ int32_t tsdbTakeReadSnap2(STsdbReader* pReader, _query_reseek_func_t reseek, STs
   }
 
   // fs
-  code = tsdbFSCreateRefSnapshot(pTsdb->pFS, &pReader->status.pfSetArray);
+  code = tsdbFSCreateRefSnapshot(pTsdb->pFS, &pSnap->pfSetArray);
   if (code) {
     taosThreadRwlockUnlock(&pTsdb->rwLock);
     goto _exit;
@@ -4929,7 +4929,7 @@ void tsdbUntakeReadSnap2(STsdbReader* pReader, STsdbReadSnap* pSnap, bool proact
     if (pSnap->pINode) taosMemoryFree(pSnap->pINode);
     taosMemoryFree(pSnap);
 
-    tsdbFSDestroyRefSnapshot(&pReader->status.pfSetArray);
+    tsdbFSDestroyRefSnapshot(&pSnap->pfSetArray);
   }
   tsdbTrace("vgId:%d, untake read snapshot", TD_VID(pTsdb->pVnode));
 }

source/dnode/vnode/src/tsdb/tsdbReadUtil.h

@@ -20,8 +20,8 @@
 extern "C" {
 #endif
 
-#include "tsdbUtil2.h"
 #include "tsdbDataFileRW.h"
+#include "tsdbUtil2.h"
 
 #define ASCENDING_TRAVERSE(o) (o == TSDB_ORDER_ASC)
 
@@ -196,7 +196,6 @@ typedef struct SReaderStatus {
   SArray*               pLDataIterArray;
   SRowMerger            merger;
   SColumnInfoData*      pPrimaryTsCol;  // primary time stamp output col info data
-  TFileSetArray*        pfSetArray;
 } SReaderStatus;
 
 struct STsdbReader {