From dd2f6287ec96214176a506df136f821bad0e483b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 29 Mar 2024 18:59:29 +0800 Subject: [PATCH] fix(tsdb): fix rowkey assign error. --- source/common/src/tdataformat.c | 2 +- source/dnode/vnode/src/tsdb/tsdbRead2.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/source/common/src/tdataformat.c b/source/common/src/tdataformat.c index ceb572edc3..991c17c5cc 100644 --- a/source/common/src/tdataformat.c +++ b/source/common/src/tdataformat.c @@ -1298,7 +1298,7 @@ int32_t tRowKeyAssign(SRowKey *pDst, SRowKey* pSrc) { if (IS_NUMERIC_TYPE(pVal->type)) { pVal->val = pSrc->pks[i].val; } else { - memcpy(pVal->pData, pVal->pData, pVal->nData); + memcpy(pVal->pData, pSrc->pks[i].pData, pVal->nData); pVal->nData = pSrc->pks[i].nData; } } diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c index c7164d43de..5469eae1cd 100644 --- a/source/dnode/vnode/src/tsdb/tsdbRead2.c +++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c @@ -2068,8 +2068,8 @@ static int32_t initMemDataIterator(STableBlockScanInfo* pBlockScanInfo, STsdbRea return TSDB_CODE_SUCCESS; } - STsdbRowKey startKey = {0}; - tRowKeyAssign(&startKey.key, &pBlockScanInfo->lastProcKey); + STsdbRowKey startKey; + startKey.key = pBlockScanInfo->lastProcKey; startKey.version = asc ? pReader->info.verRange.minVer : pReader->info.verRange.maxVer; if ((asc && (startKey.key.ts < pWindow->skey)) || ((!asc) && startKey.key.ts > pWindow->ekey)) { startKey.key.ts = asc? pWindow->skey:pWindow->ekey;