refact code

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

@@ -115,11 +115,11 @@ int32_t tPutBlockCol(uint8_t *p, void *ph);
 int32_t tGetBlockCol(uint8_t *p, void *ph);
 int32_t tBlockColCmprFn(const void *p1, const void *p2);
 // SDataBlk
-void    tBlockReset(SDataBlk *pBlock);
+void    tDataBlkReset(SDataBlk *pBlock);
 int32_t tPutDataBlk(uint8_t *p, void *ph);
 int32_t tGetDataBlk(uint8_t *p, void *ph);
-int32_t tBlockCmprFn(const void *p1, const void *p2);
-bool    tBlockHasSma(SDataBlk *pBlock);
+int32_t tDataBlkCmprFn(const void *p1, const void *p2);
+bool    tDataBlkHasSma(SDataBlk *pDataBlk);
 // SSstBlk
 int32_t tPutSstBlk(uint8_t *p, void *ph);
 int32_t tGetSstBlk(uint8_t *p, void *ph);

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

@@ -604,7 +604,7 @@ static int32_t getNextRowFromFS(void *iter, TSDBROW **ppRow) {
       if (state->iBlock >= 0) {
         SDataBlk block = {0};
 
-        tBlockReset(&block);
+        tDataBlkReset(&block);
         // tBlockDataReset(&state->blockData);
         tBlockDataReset(state->pBlockData);
 

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

@@ -566,7 +566,7 @@ static int32_t tsdbCommitDataBlock(SCommitter *pCommitter) {
 
   ASSERT(pBlockData->nRow > 0);
 
-  tBlockReset(&block);
+  tDataBlkReset(&block);
 
   // info
   block.nRow += pBlockData->nRow;
@@ -1246,7 +1246,7 @@ static int32_t tsdbMergeTableData(SCommitter *pCommitter, TABLEID id) {
     tMapDataGetItemByIdx(&pCommitter->dReader.mBlock, iBlock, pDataBlk, tGetDataBlk);
     while (pDataBlk && pRowInfo) {
       SDataBlk tBlock = {.minKey = TSDBROW_KEY(&pRowInfo->row), .maxKey = TSDBROW_KEY(&pRowInfo->row)};
-      int32_t  c = tBlockCmprFn(pDataBlk, &tBlock);
+      int32_t  c = tDataBlkCmprFn(pDataBlk, &tBlock);
 
       if (c < 0) {
         code = tMapDataPutItem(&pCommitter->dWriter.mBlock, pDataBlk, tPutDataBlk);

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

@@ -3452,7 +3452,7 @@ int32_t tsdbRetrieveDatablockSMA(STsdbReader* pReader, SColumnDataAgg*** pBlockS
 
   SBlockLoadSuppInfo* pSup = &pReader->suppInfo;
 
-  if (tBlockHasSma(pBlock)) {
+  if (tDataBlkHasSma(pBlock)) {
     code = tsdbReadBlockSma(pReader->pFileReader, pBlock, pSup->pColAgg);
     if (code != TSDB_CODE_SUCCESS) {
       tsdbDebug("vgId:%d, failed to load block SMA for uid %" PRIu64 ", code:%s, %s", 0, pFBlock->uid, tstrerror(code),

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

@@ -478,7 +478,7 @@ static int32_t tsdbSnapWriteTableDataEnd(STsdbSnapWriter* pWriter) {
         code = tMapDataPutItem(&pWriter->mBlockW, &pWriter->blockW, tPutDataBlk);
         if (code) goto _err;
 
-        tBlockReset(&pWriter->blockW);
+        tDataBlkReset(&pWriter->blockW);
         tBlockDataClear(&pWriter->bDataW);
       }
 
@@ -671,7 +671,7 @@ static int32_t tsdbSnapWriteTableDataImpl(STsdbSnapWriter* pWriter) {
             code = tMapDataPutItem(&pWriter->mBlockW, &pWriter->blockW, tPutDataBlk);
             if (code) goto _err;
 
-            tBlockReset(&pWriter->blockW);
+            tDataBlkReset(&pWriter->blockW);
             tBlockDataClear(&pWriter->bDataW);
           }
 
@@ -722,7 +722,7 @@ static int32_t tsdbSnapWriteTableDataImpl(STsdbSnapWriter* pWriter) {
     code = tMapDataPutItem(&pWriter->mBlockW, &pWriter->blockW, tPutDataBlk);
     if (code) goto _err;
 
-    tBlockReset(&pWriter->blockW);
+    tDataBlkReset(&pWriter->blockW);
     tBlockDataClear(&pWriter->bDataW);
   }
 
@@ -803,7 +803,7 @@ static int32_t tsdbSnapWriteTableData(STsdbSnapWriter* pWriter, TABLEID id) {
     pWriter->pBlockIdxW->suid = id.suid;
     pWriter->pBlockIdxW->uid = id.uid;
 
-    tBlockReset(&pWriter->blockW);
+    tDataBlkReset(&pWriter->blockW);
     tBlockDataReset(&pWriter->bDataW);
     tMapDataReset(&pWriter->mBlockW);
   }

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

@@ -232,7 +232,7 @@ int32_t tCmprBlockL(void const *lhs, void const *rhs) {
 }
 
 // SDataBlk ======================================================
-void tBlockReset(SDataBlk *pDataBlk) {
+void tDataBlkReset(SDataBlk *pDataBlk) {
   *pDataBlk = (SDataBlk){.minKey = TSDBKEY_MAX, .maxKey = TSDBKEY_MIN, .minVer = VERSION_MAX, .maxVer = VERSION_MIN};
 }
 
@@ -291,7 +291,7 @@ int32_t tGetDataBlk(uint8_t *p, void *ph) {
   return n;
 }
 
-int32_t tBlockCmprFn(const void *p1, const void *p2) {
+int32_t tDataBlkCmprFn(const void *p1, const void *p2) {
   SDataBlk *pBlock1 = (SDataBlk *)p1;
   SDataBlk *pBlock2 = (SDataBlk *)p2;
 
@@ -304,7 +304,7 @@ int32_t tBlockCmprFn(const void *p1, const void *p2) {
   return 0;
 }
 
-bool tBlockHasSma(SDataBlk *pDataBlk) {
+bool tDataBlkHasSma(SDataBlk *pDataBlk) {
   if (pDataBlk->nSubBlock > 1) return false;
   if (pDataBlk->hasDup) return false;