From eb888684e31887a560c214ea5b17e11b1ae9eead Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Mon, 4 Jul 2022 06:47:41 +0000 Subject: [PATCH] more refact --- source/dnode/vnode/inc/vnode.h | 26 ++++----- source/dnode/vnode/src/inc/vnodeInt.h | 34 ++++++------ source/dnode/vnode/src/meta/metaSnapshot.c | 16 +++--- source/dnode/vnode/src/tsdb/tsdbSnapshot.c | 25 +++++---- source/dnode/vnode/src/vnd/vnodeSnapshot.c | 62 +++++++++++----------- 5 files changed, 84 insertions(+), 79 deletions(-) diff --git a/source/dnode/vnode/inc/vnode.h b/source/dnode/vnode/inc/vnode.h index 0b06261f0f..348c792dd3 100644 --- a/source/dnode/vnode/inc/vnode.h +++ b/source/dnode/vnode/inc/vnode.h @@ -39,11 +39,11 @@ extern "C" { #endif // vnode -typedef struct SVnode SVnode; -typedef struct STsdbCfg STsdbCfg; // todo: remove -typedef struct SVnodeCfg SVnodeCfg; -typedef struct SVSnapshotReader SVSnapshotReader; -typedef struct SVSnapshotWriter SVSnapshotWriter; +typedef struct SVnode SVnode; +typedef struct STsdbCfg STsdbCfg; // todo: remove +typedef struct SVnodeCfg SVnodeCfg; +typedef struct SVSnapReader SVSnapReader; +typedef struct SVSnapWriter SVSnapWriter; extern const SVnodeCfg vnodeCfgDefault; @@ -157,14 +157,14 @@ int32_t tqRetrieveDataBlock(SSDataBlock *pBlock, SStreamReader *pHandle); // sma int32_t smaGetTSmaDays(SVnodeCfg *pCfg, void *pCont, uint32_t contLen, int32_t *days); -// SVSnapshotReader -int32_t vnodeSnapshotReaderOpen(SVnode *pVnode, SVSnapshotReader **ppReader, int64_t sver, int64_t ever); -int32_t vnodeSnapshotReaderClose(SVSnapshotReader *pReader); -int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32_t *nData); -// SVSnapshotWriter; -int32_t vnodeSnapshotWriterOpen(SVnode *pVnode, int64_t sver, int64_t ever, SVSnapshotWriter **ppWriter); -int32_t vnodeSnapshotWrite(SVSnapshotWriter *pWriter, uint8_t *pData, uint32_t nData); -int32_t vnodeSnapshotWriterClose(SVSnapshotWriter *pWriter, int8_t rollback); +// SVSnapReader +int32_t vnodeSnapReaderOpen(SVnode *pVnode, SVSnapReader **ppReader, int64_t sver, int64_t ever); +int32_t vnodeSnapReaderClose(SVSnapReader *pReader); +int32_t vnodeSnapRead(SVSnapReader *pReader, const void **ppData, uint32_t *nData); +// SVSnapWriter; +int32_t vnodeSnapshotWriterOpen(SVnode *pVnode, int64_t sver, int64_t ever, SVSnapWriter **ppWriter); +int32_t vnodeSnapshotWrite(SVSnapWriter *pWriter, uint8_t *pData, uint32_t nData); +int32_t vnodeSnapshotWriterClose(SVSnapWriter *pWriter, int8_t rollback); // structs struct STsdbCfg { diff --git a/source/dnode/vnode/src/inc/vnodeInt.h b/source/dnode/vnode/src/inc/vnodeInt.h index 8d77a41c8a..7676f2f6e8 100644 --- a/source/dnode/vnode/src/inc/vnodeInt.h +++ b/source/dnode/vnode/src/inc/vnodeInt.h @@ -49,17 +49,17 @@ extern "C" { #endif -typedef struct SVnodeInfo SVnodeInfo; -typedef struct SMeta SMeta; -typedef struct SSma SSma; -typedef struct STsdb STsdb; -typedef struct STQ STQ; -typedef struct SVState SVState; -typedef struct SVBufPool SVBufPool; -typedef struct SQWorker SQHandle; -typedef struct STsdbKeepCfg STsdbKeepCfg; -typedef struct SMetaSnapshotReader SMetaSnapshotReader; -typedef struct STsdbSnapshotReader STsdbSnapshotReader; +typedef struct SVnodeInfo SVnodeInfo; +typedef struct SMeta SMeta; +typedef struct SSma SSma; +typedef struct STsdb STsdb; +typedef struct STQ STQ; +typedef struct SVState SVState; +typedef struct SVBufPool SVBufPool; +typedef struct SQWorker SQHandle; +typedef struct STsdbKeepCfg STsdbKeepCfg; +typedef struct SMetaSnapReader SMetaSnapReader; +typedef struct STsdbSnapReader STsdbSnapReader; #define VNODE_META_DIR "meta" #define VNODE_TSDB_DIR "tsdb" @@ -108,9 +108,9 @@ STSma* metaGetSmaInfoByIndex(SMeta* pMeta, int64_t indexUid); STSmaWrapper* metaGetSmaInfoByTable(SMeta* pMeta, tb_uid_t uid, bool deepCopy); SArray* metaGetSmaIdsByTable(SMeta* pMeta, tb_uid_t uid); SArray* metaGetSmaTbUids(SMeta* pMeta); -int32_t metaSnapshotReaderOpen(SMeta* pMeta, SMetaSnapshotReader** ppReader, int64_t sver, int64_t ever); -int32_t metaSnapshotReaderClose(SMetaSnapshotReader* pReader); -int32_t metaSnapshotRead(SMetaSnapshotReader* pReader, void** ppData, uint32_t* nData); +int32_t metaSnapReaderOpen(SMeta* pMeta, SMetaSnapReader** ppReader, int64_t sver, int64_t ever); +int32_t metaSnapReaderClose(SMetaSnapReader* pReader); +int32_t metaSnapRead(SMetaSnapReader* pReader, void** ppData, uint32_t* nData); void* metaGetIdx(SMeta* pMeta); void* metaGetIvtIdx(SMeta* pMeta); int metaTtlSmaller(SMeta* pMeta, uint64_t time, SArray* uidList); @@ -130,9 +130,9 @@ int32_t tsdbInsertTableData(STsdb* pTsdb, int64_t version, SSubmitMsgIter* p int32_t tsdbDeleteTableData(STsdb* pTsdb, int64_t version, tb_uid_t suid, tb_uid_t uid, TSKEY sKey, TSKEY eKey); STsdbReader tsdbQueryCacheLastT(STsdb* tsdb, SQueryTableDataCond* pCond, STableListInfo* tableList, uint64_t qId, void* pMemRef); -int32_t tsdbSnapshotReaderOpen(STsdb* pTsdb, STsdbSnapshotReader** ppReader, int64_t sver, int64_t ever); -int32_t tsdbSnapshotReaderClose(STsdbSnapshotReader* pReader); -int32_t tsdbSnapshotRead(STsdbSnapshotReader* pReader, void** ppData, uint32_t* nData); +int32_t tsdbSnapReaderOpen(STsdb* pTsdb, STsdbSnapReader** ppReader, int64_t sver, int64_t ever); +int32_t tsdbSnapReaderClose(STsdbSnapReader* pReader); +int32_t tsdbSnapRead(STsdbSnapReader* pReader, void** ppData, uint32_t* nData); // tq int tqInit(); diff --git a/source/dnode/vnode/src/meta/metaSnapshot.c b/source/dnode/vnode/src/meta/metaSnapshot.c index 5757039d55..146d24e998 100644 --- a/source/dnode/vnode/src/meta/metaSnapshot.c +++ b/source/dnode/vnode/src/meta/metaSnapshot.c @@ -15,19 +15,19 @@ #include "meta.h" -struct SMetaSnapshotReader { +struct SMetaSnapReader { SMeta* pMeta; TBC* pTbc; int64_t sver; int64_t ever; }; -int32_t metaSnapshotReaderOpen(SMeta* pMeta, SMetaSnapshotReader** ppReader, int64_t sver, int64_t ever) { - int32_t code = 0; - int32_t c = 0; - SMetaSnapshotReader* pMetaReader = NULL; +int32_t metaSnapReaderOpen(SMeta* pMeta, SMetaSnapReader** ppReader, int64_t sver, int64_t ever) { + int32_t code = 0; + int32_t c = 0; + SMetaSnapReader* pMetaReader = NULL; - pMetaReader = (SMetaSnapshotReader*)taosMemoryCalloc(1, sizeof(*pMetaReader)); + pMetaReader = (SMetaSnapReader*)taosMemoryCalloc(1, sizeof(*pMetaReader)); if (pMetaReader == NULL) { code = TSDB_CODE_OUT_OF_MEMORY; goto _err; @@ -53,7 +53,7 @@ _err: return code; } -int32_t metaSnapshotReaderClose(SMetaSnapshotReader* pReader) { +int32_t metaSnapReaderClose(SMetaSnapReader* pReader) { if (pReader) { tdbTbcClose(pReader->pTbc); taosMemoryFree(pReader); @@ -61,7 +61,7 @@ int32_t metaSnapshotReaderClose(SMetaSnapshotReader* pReader) { return 0; } -int32_t metaSnapshotRead(SMetaSnapshotReader* pReader, void** ppData, uint32_t* nDatap) { +int32_t metaSnapRead(SMetaSnapReader* pReader, void** ppData, uint32_t* nDatap) { const void* pKey = NULL; const void* pData = NULL; int32_t nKey = 0; diff --git a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c index c6d1377591..57eebfc2b2 100644 --- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c +++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c @@ -15,7 +15,7 @@ #include "tsdb.h" -struct STsdbSnapshotReader { +struct STsdbSnapReader { STsdb* pTsdb; int64_t sver; int64_t ever; @@ -25,22 +25,23 @@ struct STsdbSnapshotReader { SDelFReader* pDelFReader; }; -typedef struct STsdbSnapshotWriter { +typedef struct STsdbSnapWriter { STsdb* pTsdb; int64_t sver; int64_t ever; // for data file + int32_t iDFileSet; SDataFWriter* pDataFWriter; // for del file SDelFWriter* pDelFWriter; -} STsdbSnapshotWriter; +} STsdbSnapWriter; -int32_t tsdbSnapshotReaderOpen(STsdb* pTsdb, STsdbSnapshotReader** ppReader, int64_t sver, int64_t ever) { - int32_t code = 0; - STsdbSnapshotReader* pReader = NULL; +int32_t tsdbSnapReaderOpen(STsdb* pTsdb, STsdbSnapReader** ppReader, int64_t sver, int64_t ever) { + int32_t code = 0; + STsdbSnapReader* pReader = NULL; // alloc - pReader = (STsdbSnapshotReader*)taosMemoryCalloc(1, sizeof(*pReader)); + pReader = (STsdbSnapReader*)taosMemoryCalloc(1, sizeof(*pReader)); if (pReader == NULL) { code = TSDB_CODE_OUT_OF_MEMORY; goto _err; @@ -58,9 +59,13 @@ _err: return code; } -int32_t tsdbSnapshotRead(STsdbSnapshotReader* pReader, void** ppData, uint32_t* nData) { +int32_t tsdbSnapRead(STsdbSnapReader* pReader, void** ppData, uint32_t* nData) { int32_t code = 0; - // TODO + + // read data file + + // read del file + return code; _err: @@ -68,7 +73,7 @@ _err: return code; } -int32_t tsdbSnapshotReaderClose(STsdbSnapshotReader* pReader) { +int32_t tsdbSnapReaderClose(STsdbSnapReader* pReader) { int32_t code = 0; taosMemoryFree(pReader); return code; diff --git a/source/dnode/vnode/src/vnd/vnodeSnapshot.c b/source/dnode/vnode/src/vnd/vnodeSnapshot.c index 8d2a316d64..2de1d37d70 100644 --- a/source/dnode/vnode/src/vnd/vnodeSnapshot.c +++ b/source/dnode/vnode/src/vnd/vnodeSnapshot.c @@ -15,29 +15,29 @@ #include "vnodeInt.h" -struct SVSnapshotReader { - SVnode *pVnode; - int64_t sver; - int64_t ever; - int8_t isMetaEnd; - int8_t isTsdbEnd; - SMetaSnapshotReader *pMetaReader; - STsdbSnapshotReader *pTsdbReader; - void *pData; - int32_t nData; +struct SVSnapReader { + SVnode *pVnode; + int64_t sver; + int64_t ever; + int8_t isMetaEnd; + int8_t isTsdbEnd; + SMetaSnapReader *pMetaReader; + STsdbSnapReader *pTsdbReader; + void *pData; + int32_t nData; }; -struct SVSnapshotWriter { +struct SVSnapWriter { SVnode *pVnode; int64_t sver; int64_t ever; }; -// SVSnapshotReader ======================================================== -int32_t vnodeSnapshotReaderOpen(SVnode *pVnode, SVSnapshotReader **ppReader, int64_t sver, int64_t ever) { - SVSnapshotReader *pReader = NULL; +// SVSnapReader ======================================================== +int32_t vnodeSnapReaderOpen(SVnode *pVnode, SVSnapReader **ppReader, int64_t sver, int64_t ever) { + SVSnapReader *pReader = NULL; - pReader = (SVSnapshotReader *)taosMemoryCalloc(1, sizeof(*pReader)); + pReader = (SVSnapReader *)taosMemoryCalloc(1, sizeof(*pReader)); if (pReader == NULL) { terrno = TSDB_CODE_OUT_OF_MEMORY; goto _err; @@ -48,13 +48,13 @@ int32_t vnodeSnapshotReaderOpen(SVnode *pVnode, SVSnapshotReader **ppReader, int pReader->isMetaEnd = 0; pReader->isTsdbEnd = 0; - if (metaSnapshotReaderOpen(pVnode->pMeta, &pReader->pMetaReader, sver, ever) < 0) { + if (metaSnapReaderOpen(pVnode->pMeta, &pReader->pMetaReader, sver, ever) < 0) { taosMemoryFree(pReader); goto _err; } - if (tsdbSnapshotReaderOpen(pVnode->pTsdb, &pReader->pTsdbReader, sver, ever) < 0) { - metaSnapshotReaderClose(pReader->pMetaReader); + if (tsdbSnapReaderOpen(pVnode->pTsdb, &pReader->pTsdbReader, sver, ever) < 0) { + metaSnapReaderClose(pReader->pMetaReader); taosMemoryFree(pReader); goto _err; } @@ -68,21 +68,21 @@ _err: return -1; } -int32_t vnodeSnapshotReaderClose(SVSnapshotReader *pReader) { +int32_t vnodeSnapReaderClose(SVSnapReader *pReader) { if (pReader) { vnodeFree(pReader->pData); - tsdbSnapshotReaderClose(pReader->pTsdbReader); - metaSnapshotReaderClose(pReader->pMetaReader); + tsdbSnapReaderClose(pReader->pTsdbReader); + metaSnapReaderClose(pReader->pMetaReader); taosMemoryFree(pReader); } return 0; } -int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32_t *nData) { +int32_t vnodeSnapRead(SVSnapReader *pReader, const void **ppData, uint32_t *nData) { int32_t code = 0; if (!pReader->isMetaEnd) { - code = metaSnapshotRead(pReader->pMetaReader, &pReader->pData, &pReader->nData); + code = metaSnapRead(pReader->pMetaReader, &pReader->pData, &pReader->nData); if (code) { if (code == TSDB_CODE_VND_READ_END) { pReader->isMetaEnd = 1; @@ -97,7 +97,7 @@ int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32 } if (!pReader->isTsdbEnd) { - code = tsdbSnapshotRead(pReader->pTsdbReader, &pReader->pData, &pReader->nData); + code = tsdbSnapRead(pReader->pTsdbReader, &pReader->pData, &pReader->nData); if (code) { if (code == TSDB_CODE_VND_READ_END) { pReader->isTsdbEnd = 1; @@ -115,13 +115,13 @@ int32_t vnodeSnapshotRead(SVSnapshotReader *pReader, const void **ppData, uint32 return code; } -// SVSnapshotWriter ======================================================== -int32_t vnodeSnapshotWriterOpen(SVnode *pVnode, int64_t sver, int64_t ever, SVSnapshotWriter **ppWriter) { - int32_t code = 0; - SVSnapshotWriter *pWriter = NULL; +// SVSnapWriter ======================================================== +int32_t vnodeSnapshotWriterOpen(SVnode *pVnode, int64_t sver, int64_t ever, SVSnapWriter **ppWriter) { + int32_t code = 0; + SVSnapWriter *pWriter = NULL; // alloc - pWriter = (SVSnapshotWriter *)taosMemoryCalloc(1, sizeof(*pWriter)); + pWriter = (SVSnapWriter *)taosMemoryCalloc(1, sizeof(*pWriter)); if (pWriter == NULL) { code = TSDB_CODE_OUT_OF_MEMORY; goto _err; @@ -136,13 +136,13 @@ _err: return code; } -int32_t vnodeSnapshotWrite(SVSnapshotWriter *pWriter, uint8_t *pData, uint32_t nData) { +int32_t vnodeSnapshotWrite(SVSnapWriter *pWriter, uint8_t *pData, uint32_t nData) { int32_t code = 0; // TODO return code; } -int32_t vnodeSnapshotWriterClose(SVSnapshotWriter *pWriter, int8_t rollback) { +int32_t vnodeSnapshotWriterClose(SVSnapWriter *pWriter, int8_t rollback) { int32_t code = 0; if (!rollback) { -- GitLab