From 6c8de26f73f363021a1cd962f73a47dc8e22ee9e Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Tue, 5 Jul 2022 03:47:06 +0000 Subject: [PATCH] more snapshot --- source/dnode/vnode/src/tsdb/tsdbSnapshot.c | 23 +++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c index f92445f51a..3578c4e192 100644 --- a/source/dnode/vnode/src/tsdb/tsdbSnapshot.c +++ b/source/dnode/vnode/src/tsdb/tsdbSnapshot.c @@ -80,7 +80,7 @@ static int32_t tsdbSnapReadDel(STsdbSnapReader* pReader, uint8_t** ppData) { while (pReader->iDelIdx < taosArrayGetSize(pReader->aDelIdx)) { SDelIdx* pDelIdx = (SDelIdx*)taosArrayGet(pReader->aDelIdx, pReader->iDelIdx); - int8_t overlap = 0; + int32_t size = 0; code = tsdbReadDelData(pReader->pDelFReader, pDelIdx, pReader->aDelData, NULL); if (code) goto _err; @@ -89,13 +89,26 @@ static int32_t tsdbSnapReadDel(STsdbSnapReader* pReader, uint8_t** ppData) { SDelData* pDelData = (SDelData*)taosArrayGet(pReader->aDelData, iDelData); if (pDelData->version >= pReader->sver && pDelData->version <= pReader->ever) { - // encode the data to sync (todo) - overlap = 1; + size += tPutDelData(NULL, pDelData); } } - if (overlap) { - // prepare the data + if (size > 0) { + code = tRealloc(ppData, sizeof(SSnapDataHdr) + size); // TODO + if (code) goto _err; + + // encode + ((SSnapDataHdr*)(*ppData))->type = 1; + ((SSnapDataHdr*)(*ppData))->size = size; + + for (int32_t iDelData = 0; iDelData < taosArrayGetSize(pReader->aDelData); iDelData++) { + SDelData* pDelData = (SDelData*)taosArrayGet(pReader->aDelData, iDelData); + + if (pDelData->version >= pReader->sver && pDelData->version <= pReader->ever) { + // size += tPutDelData(NULL, pDelData); (todo) + } + } + goto _exit; } }