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

Merge branch 'enh/new3.0' into enh/refactorBackend

This commit is contained in:
yihaoDeng 2023-11-03 10:40:00 +08:00
parent 24e961976f
commit d82d51cf8f
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source/libs/stream/src/streamBackendRocksdb.c
View File

@ -258,9 +258,6 @@ int32_t dbChkpGetDelta(SDbChkp* p, int64_t chkpId, SArray *list) {
} }
} }
if (p->init == 0) { if (p->init == 0) {
p->preCkptId = -1;
p->curChkpId = chkpId;
p->init = 1;
void* pIter = taosHashIterate(p->pSstTbl[1 - p->idx], NULL); void* pIter = taosHashIterate(p->pSstTbl[1 - p->idx], NULL);
while (pIter) { while (pIter) {
@ -272,6 +269,10 @@ int32_t dbChkpGetDelta(SDbChkp* p, int64_t chkpId, SArray *list) {
pIter = taosHashIterate(p->pSstTbl[1 - p->idx], pIter); pIter = taosHashIterate(p->pSstTbl[1 - p->idx], pIter);
} }
if (taosArrayGetSize(p->pAdd) > 0) p->update = 1; if (taosArrayGetSize(p->pAdd) > 0) p->update = 1;
p->init = 1;
p->preCkptId = -1;
p->curChkpId = chkpId;
} else { } else {
int32_t code = compareHashTable(p->pSstTbl[p->idx], p->pSstTbl[1 - p->idx], p->pAdd, p->pDel); int32_t code = compareHashTable(p->pSstTbl[p->idx], p->pSstTbl[1 - p->idx], p->pAdd, p->pDel);
if (code != 0) { if (code != 0) {
@ -284,12 +285,15 @@ int32_t dbChkpGetDelta(SDbChkp* p, int64_t chkpId, SArray *list) {
return code; return code;
} }
p->preCkptId = p->curChkpId;
p->curChkpId = chkpId;
if (taosArrayGetSize(p->pAdd) == 0 && taosArrayGetSize(p->pDel) == 0) { if (taosArrayGetSize(p->pAdd) == 0 && taosArrayGetSize(p->pDel) == 0) {
p->update = 0; p->update = 0;
} }
p->preCkptId = p->curChkpId;
p->curChkpId = chkpId;
} }
taosHashClear(p->pSstTbl[p->idx]); taosHashClear(p->pSstTbl[p->idx]);
p->idx = 1 - p->idx; p->idx = 1 - p->idx;