From 82468f162a35f7d630d486687ba6a51ab43f4045 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Wed, 12 Jul 2023 16:43:56 +0800 Subject: [PATCH] Merge branch 'enh/triggerCheckPoint2' of https://github.com/taosdata/TDengine into enh/triggerCheckPoint2 --- source/libs/stream/src/streamCheckpoint.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c index 5d52042127..fca949a006 100644 --- a/source/libs/stream/src/streamCheckpoint.c +++ b/source/libs/stream/src/streamCheckpoint.c @@ -269,26 +269,26 @@ int32_t streamSaveTasks(SStreamMeta* pMeta, int64_t checkpointId) { taosWLockLatch(&pMeta->lock); for (int32_t i = 0; i < taosArrayGetSize(pMeta->pTaskList); ++i) { - uint32_t* pTaskId = taosArrayGet(pMeta->pTaskList, i); + uint32_t* pTaskId = taosArrayGet(pMeta->pTaskList, i); SStreamTask* p = *(SStreamTask**)taosHashGet(pMeta->pTasks, pTaskId, sizeof(*pTaskId)); ASSERT(p->chkInfo.keptCheckpointId < p->checkpointingId && p->checkpointingId == checkpointId); p->chkInfo.keptCheckpointId = p->checkpointingId; streamMetaSaveTask(pMeta, p); - qDebug("vgId:%d s-task:%s commit task status after checkpoint completed, checkpointId:%" PRId64 - ", ver:%" PRId64 " currentVer:%" PRId64, + qDebug("vgId:%d s-task:%s commit task status after checkpoint completed, checkpointId:%" PRId64 ", ver:%" PRId64 + " currentVer:%" PRId64, pMeta->vgId, p->id.idStr, checkpointId, p->chkInfo.version, p->chkInfo.currentVer); } if (streamMetaCommit(pMeta) < 0) { taosWUnLockLatch(&pMeta->lock); - qError("vgId:%d failed to commit stream meta after do checkpoint, checkpointId:%" PRId64", since %s", - pMeta->vgId, checkpointId, terrstr()); + qError("vgId:%d failed to commit stream meta after do checkpoint, checkpointId:%" PRId64 ", since %s", pMeta->vgId, + checkpointId, terrstr()); return -1; } else { taosWUnLockLatch(&pMeta->lock); - qInfo("vgId:%d commit stream meta after do checkpoint, checkpointId:%. DONE" PRId64, pMeta->vgId, checkpointId); + qInfo("vgId:%d commit stream meta after do checkpoint, checkpointId:%" PRId64 " DONE", pMeta->vgId, checkpointId); } return TSDB_CODE_SUCCESS;