diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c b/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c index a5c319e2c47d0cf7d2c88dcdc4e999c05081da84..68b53c48d9048209517f3675af16f627491d3ba5 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbCommit.c @@ -33,7 +33,7 @@ typedef struct { TSKEY minKey; TSKEY maxKey; // writer - SSttFWriter *pWriter; + struct SSttFWriter *pWriter; } SCommitter; static int32_t tsdbCommitOpenWriter(SCommitter *pCommitter) { diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c b/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c index 43cb39efb062619b5fe38fb010bf00ad26f5aa6f..815b783bd9fd0a2818bec660ce88c5c767ebbb47 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c +++ b/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.c @@ -22,7 +22,7 @@ extern int32_t tsdbReadFile(STsdbFD *pFD, int64_t offset, uint8_t *pBuf, int64_t extern int32_t tsdbFsyncFile(STsdbFD *pFD); struct SSttFWriter { - SSttFWriterConf config; + struct SSttFWriterConf config; // time-series data SBlockData bData; SArray *aSttBlk; // SArray @@ -35,7 +35,7 @@ struct SSttFWriter { STsdbFD *pFd; }; -static int32_t write_ts_block(SSttFWriter *pWriter) { +static int32_t write_ts_block(struct SSttFWriter *pWriter) { int32_t code = 0; int32_t lino; @@ -73,28 +73,28 @@ _exit: return code; } -static int32_t write_del_block(SSttFWriter *pWriter) { +static int32_t write_del_block(struct SSttFWriter *pWriter) { int32_t code = 0; // TODO return code; } -static int32_t write_stt_blk(SSttFWriter *pWriter) { +static int32_t write_stt_blk(struct SSttFWriter *pWriter) { int32_t code = 0; // TODO return code; } -static int32_t write_del_blk(SSttFWriter *pWriter) { +static int32_t write_del_blk(struct SSttFWriter *pWriter) { int32_t code = 0; // TODO return code; } -static int32_t stt_fwriter_create(const SSttFWriterConf *pConf, SSttFWriter **ppWriter) { +static int32_t stt_fwriter_create(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter) { int32_t code = 0; - if ((ppWriter[0] = taosMemoryCalloc(1, sizeof(SSttFWriter))) == NULL) { + if ((ppWriter[0] = taosMemoryCalloc(1, sizeof(*ppWriter[0]))) == NULL) { code = TSDB_CODE_OUT_OF_MEMORY; goto _exit; } @@ -124,7 +124,7 @@ _exit: return code; } -static int32_t stt_fwriter_destroy(SSttFWriter *pWriter) { +static int32_t stt_fwriter_destroy(struct SSttFWriter *pWriter) { if (pWriter) { tDestroyTSchema(pWriter->skmTb.pTSchema); tDestroyTSchema(pWriter->skmRow.pTSchema); @@ -135,19 +135,19 @@ static int32_t stt_fwriter_destroy(SSttFWriter *pWriter) { return 0; } -static int32_t stt_fwriter_open(SSttFWriter *pWriter) { +static int32_t stt_fwriter_open(struct SSttFWriter *pWriter) { int32_t code = 0; // TODO return code; } -static int32_t stt_fwriter_close(SSttFWriter *pWriter) { +static int32_t stt_fwriter_close(struct SSttFWriter *pWriter) { int32_t code = 0; // TODO return code; } -int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter) { +int32_t tsdbSttFWriterOpen(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter) { int32_t code = 0; int32_t lino; @@ -168,7 +168,7 @@ _exit: return code; } -int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter) { +int32_t tsdbSttFWriterClose(struct SSttFWriter **ppWriter) { int32_t vgId = TD_VID(ppWriter[0]->config.pTsdb->pVnode); int32_t code = 0; int32_t lino; @@ -185,7 +185,7 @@ _exit: return code; } -int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) { +int32_t tsdbSttFWriteTSData(struct SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow) { int32_t code = 0; int32_t lino; @@ -225,7 +225,7 @@ _exit: return code; } -int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData) { +int32_t tsdbSttFWriteDLData(struct SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData) { int32_t code = 0; // TODO return code; diff --git a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h b/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h index 3a1b28a560fab7270837c2435ae83f3ee2b96669..59280a0baa6b6cbeb7d4046796fd9f994a863177 100644 --- a/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h +++ b/source/dnode/vnode/src/tsdb/dev/tsdbSttFWriter.h @@ -22,13 +22,13 @@ extern "C" { #endif -typedef struct SSttFWriter SSttFWriter; -typedef struct SSttFWriterConf SSttFWriterConf; +struct SSttFWriter; +struct SSttFWriterConf; -int32_t tsdbSttFWriterOpen(const SSttFWriterConf *pConf, SSttFWriter **ppWriter); -int32_t tsdbSttFWriterClose(SSttFWriter **ppWriter); -int32_t tsdbSttFWriteTSData(SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow); -int32_t tsdbSttFWriteDLData(SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData); +int32_t tsdbSttFWriterOpen(const struct SSttFWriterConf *pConf, struct SSttFWriter **ppWriter); +int32_t tsdbSttFWriterClose(struct SSttFWriter **ppWriter); +int32_t tsdbSttFWriteTSData(struct SSttFWriter *pWriter, TABLEID *tbid, TSDBROW *pRow); +int32_t tsdbSttFWriteDLData(struct SSttFWriter *pWriter, TABLEID *tbid, SDelData *pDelData); struct SSttFWriterConf { STsdb *pTsdb;