diff --git a/src/tsdb/inc/tsdbReadImpl.h b/src/tsdb/inc/tsdbReadImpl.h index f067905f5c0dcf4fde64dfc066d4d1a1dbabb25d..088fc5e580a30ff8f796486bbb6aa20ebe5d689c 100644 --- a/src/tsdb/inc/tsdbReadImpl.h +++ b/src/tsdb/inc/tsdbReadImpl.h @@ -75,7 +75,8 @@ typedef struct { uint64_t aggrStat : 3; \ uint64_t blkVer : 5; \ uint64_t aggrOffset : 56; \ - uint32_t aggrLen + uint32_t aggrLen; \ + uint32_t reserved typedef struct { SBlockFieldsP0; @@ -118,6 +119,7 @@ typedef struct { char padding[1]; } SBlockColV0; + typedef struct { int16_t colId; uint8_t offsetH; @@ -125,8 +127,7 @@ typedef struct { int32_t len; uint32_t type : 8; uint32_t offset : 24; - // char padding[]; -} SBlockColV1; +} SBlockColV1; // size #define SBlockCol SBlockColV1 // latest SBlockCol definition diff --git a/src/tsdb/src/tsdbCommit.c b/src/tsdb/src/tsdbCommit.c index be59a2e1d70c3d913a7164d6ec756f125b030f46..53ca51004fc406b05028d13be7cd2bf054771c0d 100644 --- a/src/tsdb/src/tsdbCommit.c +++ b/src/tsdb/src/tsdbCommit.c @@ -1263,7 +1263,7 @@ static int tsdbCommitMemData(SCommitH *pCommith, SCommitIter *pIter, TSKEY keyLi int32_t defaultRows = TSDB_COMMIT_DEFAULT_ROWS(pCommith); SDFile * pDFile; bool isLast; - SBlock block = {0}; + SBlock block; while (true) { tsdbLoadDataFromCache(pIter->pTable, pIter->pIter, keyLimit, defaultRows, pCommith->pDataCols, NULL, 0, @@ -1363,7 +1363,7 @@ static int tsdbMergeMemData(SCommitH *pCommith, SCommitIter *pIter, int bidx) { static int tsdbMoveBlock(SCommitH *pCommith, int bidx) { SBlock *pBlock = pCommith->readh.pBlkInfo->blocks + bidx; SDFile *pDFile; - SBlock block = {0}; + SBlock block; bool isSameFile; ASSERT(pBlock->numOfSubBlocks > 0); @@ -1416,7 +1416,7 @@ static int tsdbCommitAddBlock(SCommitH *pCommith, const SBlock *pSupBlock, const static int tsdbMergeBlockData(SCommitH *pCommith, SCommitIter *pIter, SDataCols *pDataCols, TSKEY keyLimit, bool isLastOneBlock) { STsdbRepo *pRepo = TSDB_COMMIT_REPO(pCommith); STsdbCfg * pCfg = REPO_CFG(pRepo); - SBlock block = {0}; + SBlock block; SDFile * pDFile; bool isLast; int32_t defaultRows = TSDB_COMMIT_DEFAULT_ROWS(pCommith);