From c58b43ba9501c6a7ab349354a20537b0f67e5c28 Mon Sep 17 00:00:00 2001 From: Hongze Cheng Date: Thu, 23 Jun 2022 01:45:53 +0000 Subject: [PATCH] more work --- source/dnode/vnode/src/tsdb/tsdbUtil.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/source/dnode/vnode/src/tsdb/tsdbUtil.c b/source/dnode/vnode/src/tsdb/tsdbUtil.c index a9c91119ae..b68e9571e6 100644 --- a/source/dnode/vnode/src/tsdb/tsdbUtil.c +++ b/source/dnode/vnode/src/tsdb/tsdbUtil.c @@ -637,14 +637,16 @@ int32_t tRowMerge(SRowMerger *pMerger, TSDBROW *pRow) { for (int32_t iCol = 1; iCol < pMerger->pTSchema->numOfCols; iCol++) { tsdbRowGetColVal(pRow, pMerger->pTSchema, iCol, pColVal); - if (pColVal->isNone) continue; - - // SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol); if (key.version > pMerger->version) { - // forward merge (todo) + if (!pColVal->isNone) { + taosArraySet(pMerger->pArray, iCol, pColVal); + } } else if (key.version < pMerger->version) { - // backward merge (todo) + SColVal *tColVal = (SColVal *)taosArrayGet(pMerger->pArray, iCol); + if (tColVal->isNone && !pColVal->isNone) { + taosArraySet(pMerger->pArray, iCol, pColVal); + } } else { ASSERT(0); }