tsdb/cache reader: move suid into reader's info field

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

@@ -861,7 +861,6 @@ typedef struct SCacheRowsReader {
   STSchema       *pSchema;
   STSchema       *pCurrSchema;
   uint64_t        uid;
-  uint64_t        suid;
   char          **transferBuf;  // todo remove it soon
   int32_t         numOfCols;
   SArray         *pCidList;

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

@@ -2803,7 +2803,7 @@ static int32_t updateTSchema(int32_t sversion, SCacheRowsReader *pReader, uint64
   }
 
   taosMemoryFreeClear(pReader->pCurrSchema);
-  return metaGetTbTSchemaEx(pReader->pTsdb->pVnode->pMeta, pReader->suid, uid, sversion, &pReader->pCurrSchema);
+  return metaGetTbTSchemaEx(pReader->pTsdb->pVnode->pMeta, pReader->info.suid, uid, sversion, &pReader->pCurrSchema);
 }
 
 static int32_t mergeLastCid(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray, SCacheRowsReader *pr, int16_t *aCols,
@@ -2835,7 +2835,7 @@ static int32_t mergeLastCid(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray, SC
   TSKEY lastRowTs = TSKEY_MAX;
 
   CacheNextRowIter iter = {0};
-  nextRowIterOpen(&iter, uid, pTsdb, pTSchema, pr->suid, pr->pLDataIterArray, pr->pReadSnap, &pr->pDataFReader,
+  nextRowIterOpen(&iter, uid, pTsdb, pTSchema, pr->info.suid, pr->pLDataIterArray, pr->pReadSnap, &pr->pDataFReader,
                   &pr->pDataFReaderLast, pr->lastTs, pr);
 
   do {
@@ -3005,7 +3005,7 @@ static int32_t mergeLastRowCid(tb_uid_t uid, STsdb *pTsdb, SArray **ppLastArray,
   TSKEY lastRowTs = TSKEY_MAX;
 
   CacheNextRowIter iter = {0};
-  nextRowIterOpen(&iter, uid, pTsdb, pTSchema, pr->suid, pr->pLDataIterArray, pr->pReadSnap, &pr->pDataFReader,
+  nextRowIterOpen(&iter, uid, pTsdb, pTSchema, pr->info.suid, pr->pLDataIterArray, pr->pReadSnap, &pr->pDataFReader,
                   &pr->pDataFReaderLast, pr->lastTs, pr);
 
   do {

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

@@ -144,10 +144,10 @@ int32_t tsdbCacherowsReaderOpen(void* pVnode, int32_t type, void* pTableIdList,
   p->pVnode = pVnode;
   p->pTsdb = p->pVnode->pTsdb;
   p->info.verRange = (SVersionRange){.minVer = 0, .maxVer = UINT64_MAX};
+  p->info.suid = suid;
   p->numOfCols = numOfCols;
   p->pCidList = pCidList;
   p->pSlotIds = pSlotIds;
-  p->suid = suid;
 
   if (numOfTables == 0) {
     *pReader = p;