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

merge from 3.0

This commit is contained in:
Liu Jicong 2022-03-01 18:00:50 +08:00
parent 4d0b896670
commit a68153ae92
2 changed files with 0 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/client/src/tmq.c
View File

@ -659,12 +659,9 @@ int32_t tmqPollCb(void* param, const SDataBuf* pMsg, int32_t code) {
/*printf("rsp commit off:%ld rsp off:%ld has data:%d\n", pRsp->committedOffset, pRsp->rspOffset, pRsp->numOfTopics);*/ /*printf("rsp commit off:%ld rsp off:%ld has data:%d\n", pRsp->committedOffset, pRsp->rspOffset, pRsp->numOfTopics);*/
if (pRsp->consumeRsp.numOfTopics == 0) { if (pRsp->consumeRsp.numOfTopics == 0) {
printf("no data\n"); printf("no data\n");
<<<<<<< Updated upstream
if (pParam->epoch == tmq->epoch) { if (pParam->epoch == tmq->epoch) {
atomic_store_32(&pVg->vgStatus, TMQ_VG_STATUS__IDLE); atomic_store_32(&pVg->vgStatus, TMQ_VG_STATUS__IDLE);
} }
=======
>>>>>>> Stashed changes
taosFreeQitem(pRsp); taosFreeQitem(pRsp);
return 0; return 0;
} }
@ -982,7 +979,6 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) {
while (1) { while (1) {
/*printf("cycle\n");*/ /*printf("cycle\n");*/
taosReadAllQitems(tmq->mqueue, tmq->qall); taosReadAllQitems(tmq->mqueue, tmq->qall);
<<<<<<< Updated upstream
rspMsg = tmqHandleAllRsp(tmq, blocking_time, true); rspMsg = tmqHandleAllRsp(tmq, blocking_time, true);
if (rspMsg) { if (rspMsg) {
return rspMsg; return rspMsg;
@ -994,14 +990,6 @@ tmq_message_t* tmq_consumer_poll(tmq_t* tmq, int64_t blocking_time) {
return NULL; return NULL;
} }
} }
=======
tmqHandleAllRsp(tmq, blocking_time, true);
/*if (blocking_time != 0 && endTime - startTime > blocking_time) {*/
/*int64_t endTime = taosGetTimestampMs();*/
/*printf("normal exit\n");*/
/*return NULL;*/
/*}*/
>>>>>>> Stashed changes
} }
} }

4
source/os/src/osFile.c
View File

@ -681,9 +681,5 @@ int32_t taosEOFFile(TdFilePtr pFile) {
} }
assert(pFile->fp != NULL); assert(pFile->fp != NULL);
<<<<<<< Updated upstream
return feof(pFile->fp);
=======
return feof(pFile->fp); return feof(pFile->fp);
>>>>>>> Stashed changes
} }