fix:conflicts

This commit is contained in:
wangmm0220 2023-03-16 19:18:07 +08:00
parent 14970478dc
commit 6323a6e801
1 changed files with 1 additions and 1 deletions

View File

@ -183,7 +183,7 @@ end:
return tbSuid == realTbSuid;
}
int64_t tqFetchLog(STQ* pTq, STqHandle* pHandle, int64_t* fetchOffset, SWalCkHead** ppCkHead) {
int32_t tqFetchLog(STQ* pTq, STqHandle* pHandle, int64_t* fetchOffset, SWalCkHead** ppCkHead) {
int32_t code = 0;
taosThreadMutexLock(&pHandle->pWalReader->mutex);
int64_t offset = *fetchOffset;