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

Merge pull request #22292 from taosdata/fix--infinit-count-loop 

disable infinite count loop
This commit is contained in:
wade zhang 2023-08-02 15:55:10 +08:00 committed by GitHub
parent 12ac393fb0 f90f0b7047
commit e0cb021a2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -359,7 +359,7 @@ static int32_t suidComparFn(const void *target, const void *p2) {
if (*uid2 == (*targetUid)) { if (*uid2 == (*targetUid)) {
return 0; return 0;
} else { } else {
return (*targetUid) < (*uid2) ? -1:1; return (*targetUid) < (*uid2) ? -1 : 1;
} }
} }
@ -381,7 +381,7 @@ static bool existsFromSttBlkStatis(const TStatisBlkArray *pStatisBlkArray, uint6
return false; return false;
} }
while(i < TARRAY2_SIZE(pStatisBlkArray)) { while (i < TARRAY2_SIZE(pStatisBlkArray)) {
SStatisBlk *p = &pStatisBlkArray->data[i]; SStatisBlk *p = &pStatisBlkArray->data[i];
if (p->minTbid.suid > suid) { if (p->minTbid.suid > suid) {
return false; return false;
@ -476,12 +476,12 @@ int32_t tLDataIterOpen2(struct SLDataIter *pIter, SSttFileReader *pSttFileReader
tsdbDebug("load the stt file info completed, elapsed time:%.2fms, %s", el, idStr); tsdbDebug("load the stt file info completed, elapsed time:%.2fms, %s", el, idStr);
} }
bool exists = existsFromSttBlkStatis(pBlockLoadInfo->pSttStatisBlkArray, suid, uid, pIter->pReader); // bool exists = existsFromSttBlkStatis(pBlockLoadInfo->pSttStatisBlkArray, suid, uid, pIter->pReader);
if (!exists) { // if (!exists) {
pIter->iSttBlk = -1; // pIter->iSttBlk = -1;
pIter->pSttBlk = NULL; // pIter->pSttBlk = NULL;
return TSDB_CODE_SUCCESS; // return TSDB_CODE_SUCCESS;
} // }
// find the start block, actually we could load the position to avoid repeatly searching for the start position when // find the start block, actually we could load the position to avoid repeatly searching for the start position when
// the skey is updated. // the skey is updated.