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

fix(tsdb): remove assert

This commit is contained in:
Haojun Liao 2024-03-22 18:42:54 +08:00
parent ef6ea16d64
commit 17a65430cd
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3101,6 +3101,7 @@ static void initBlockDumpInfo(STsdbReader* pReader, SDataBlockIter* pBlockIter)
SFileBlockDumpInfo* pDumpInfo = &pStatus->fBlockDumpInfo; SFileBlockDumpInfo* pDumpInfo = &pStatus->fBlockDumpInfo;
if (pBlockInfo) { if (pBlockInfo) {
// todo handle
// STableBlockScanInfo* pScanInfo = tSimpleHashGet(pBlockIter->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid)); // STableBlockScanInfo* pScanInfo = tSimpleHashGet(pBlockIter->pTableMap, &pBlockInfo->uid, sizeof(pBlockInfo->uid));
// if (pScanInfo) { // if (pScanInfo) {
// tsdbRowKeyAssign(&pDumpInfo->lastKey, &pScanInfo->lastProcKey); // tsdbRowKeyAssign(&pDumpInfo->lastKey, &pScanInfo->lastProcKey);
@ -4666,9 +4667,13 @@ int32_t tsdbNextDataBlock2(STsdbReader* pReader, bool* hasNext) {
tsdbReleaseReader(pReader); tsdbReleaseReader(pReader);
} }
tsdbReaderSuspend2(pReader);
tsdbReaderResume2(pReader);
return code; return code;
} }
if (pReader->step == EXTERNAL_ROWS_MAIN && pReader->innerReader[1] != NULL) { if (pReader->step == EXTERNAL_ROWS_MAIN && pReader->innerReader[1] != NULL) {
// prepare for the next row scan // prepare for the next row scan
int32_t step = -1; int32_t step = -1;

3
source/dnode/vnode/src/tsdb/tsdbReadUtil.c
View File

@ -229,8 +229,7 @@ void resetAllDataBlockScanInfo(SSHashObj* pTableMap, int64_t ts, int32_t step) {
pInfo->delSkyline = taosArrayDestroy(pInfo->delSkyline); pInfo->delSkyline = taosArrayDestroy(pInfo->delSkyline);
pInfo->lastProcKey.ts = ts; pInfo->lastProcKey.ts = ts;
ASSERT(0); // todo check the nextProcKey info
pInfo->sttKeyInfo.nextProcKey = ts + step; pInfo->sttKeyInfo.nextProcKey = ts + step;
} }
} }