From ecca2fc0b042fa432ecf53162578240fa3768ebc Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 22 Dec 2022 15:18:41 +0800 Subject: [PATCH] more code --- source/dnode/vnode/src/tsdb/tsdbCompact.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbCompact.c b/source/dnode/vnode/src/tsdb/tsdbCompact.c index a37af2813e..65fc041196 100644 --- a/source/dnode/vnode/src/tsdb/tsdbCompact.c +++ b/source/dnode/vnode/src/tsdb/tsdbCompact.c @@ -280,6 +280,14 @@ _exit: return code; } +static int32_t tsdbCompactNextRow(STsdbCompactor *pCompactor, TSDBROW **ppRow) { + int32_t code = 0; + int32_t lino = 0; + // TODO +_exit: + return code; +} + int32_t tsdbCompact(STsdb *pTsdb, int32_t flag) { int32_t code = 0; int32_t lino = 0; @@ -318,15 +326,14 @@ int32_t tsdbCompact(STsdb *pTsdb, int32_t flag) { if (pIter) tRBTreePut(&compactor.rtree, &pIter->n); } -#if 0 - if (flag & TSDB_FLG_DEEP_COMPACT) { - code = tsdbDeepCompact(&compactor); - TSDB_CHECK_CODE(code, lino, _exit); - } else { - code = tsdbShallowCompact(&compactor); + // loop to merge row by row + TSDBROW *pRow = NULL; + for (;;) { + code = tsdbCompactNextRow(&compactor, &pRow); TSDB_CHECK_CODE(code, lino, _exit); + + if (pRow == NULL) break; } -#endif } _exit: