fix:conflicts

6323a6e8 · wmmhello · 14970478 · 6323a6e8
隐藏空白更改
内联并排

Showing with 1 addition and 1 deletion

source/dnode/vnode/src/tq/tqRead.c source/dnode/vnode/src/tq/tqRead.c +1 -1

未找到文件。
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -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;