xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix(tsdb): fix rowkey assign error.

This commit is contained in:
Haojun Liao 2024-03-29 18:59:29 +08:00
parent 55bb6ab341
commit dd2f6287ec
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/common/src/tdataformat.c
View File

@ -1298,7 +1298,7 @@ int32_t tRowKeyAssign(SRowKey *pDst, SRowKey* pSrc) {
if (IS_NUMERIC_TYPE(pVal->type)) { if (IS_NUMERIC_TYPE(pVal->type)) {
pVal->val = pSrc->pks[i].val; pVal->val = pSrc->pks[i].val;
} else { } else {
memcpy(pVal->pData, pVal->pData, pVal->nData); memcpy(pVal->pData, pSrc->pks[i].pData, pVal->nData);
pVal->nData = pSrc->pks[i].nData; pVal->nData = pSrc->pks[i].nData;
} }
} }

4
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -2068,8 +2068,8 @@ static int32_t initMemDataIterator(STableBlockScanInfo* pBlockScanInfo, STsdbRea
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
STsdbRowKey startKey = {0}; STsdbRowKey startKey;
tRowKeyAssign(&startKey.key, &pBlockScanInfo->lastProcKey); startKey.key = pBlockScanInfo->lastProcKey;
startKey.version = asc ? pReader->info.verRange.minVer : pReader->info.verRange.maxVer; startKey.version = asc ? pReader->info.verRange.minVer : pReader->info.verRange.maxVer;
if ((asc && (startKey.key.ts < pWindow->skey)) || ((!asc) && startKey.key.ts > pWindow->ekey)) { if ((asc && (startKey.key.ts < pWindow->skey)) || ((!asc) && startKey.key.ts > pWindow->ekey)) {
startKey.key.ts = asc? pWindow->skey:pWindow->ekey; startKey.key.ts = asc? pWindow->skey:pWindow->ekey;