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

Merge branch 'feat/TS-4243-3.0' of github.com:taosdata/TDengine into TEST/3.0/TS-4243

This commit is contained in:
Chris Zhai 2024-04-07 10:52:51 +08:00
parent 40b6340e5e 3fab74f21b
commit 5de1ad8a20
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1197,11 +1197,16 @@ void tRowGetKey(SRow *row, SRowKey *key) {
for (int32_t i = 0; i < row->numOfPKs; i++) {
key->pks[i].type = indices[i].type;
uint8_t *tdata = data + indices[i].offset;
if (row->flag >> 4) {
tdata += tGetI16v(tdata, NULL);
}
if (IS_VAR_DATA_TYPE(indices[i].type)) {
key->pks[i].pData = data + indices[i].offset;
key->pks[i].pData = tdata;
key->pks[i].pData += tGetU32v(key->pks[i].pData, &key->pks[i].nData);
} else {
memcpy(&key->pks[i].val, data + indices[i].offset, tDataTypes[indices[i].type].bytes);
memcpy(&key->pks[i].val, tdata, tDataTypes[indices[i].type].bytes);
}
}
}

2
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
View File

@ -75,6 +75,8 @@ void *destroySttBlockLoadInfo(SSttBlockLoadInfo *pLoadInfo) {
taosArrayDestroy(pLoadInfo->info.pFirstKey);
taosArrayDestroy(pLoadInfo->info.pLastKey);
taosArrayDestroy(pLoadInfo->info.pCount);
taosArrayDestroy(pLoadInfo->info.pFirstTs);
taosArrayDestroy(pLoadInfo->info.pLastTs);
}
taosArrayDestroy(pLoadInfo->aSttBlk);