Elgato_dark/TDengine
1
0
Fork 0
mirror of https://github.com/taosdata/TDengine synced 2026-05-24 10:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

fix(stream): change code from no data to success if wal read out

Browse source
This commit is contained in:
wangmm0220 2025-05-09 12:19:18 +08:00
parent d2f59e03b0
commit 441d3d3648
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/dnode/vnode/src/vnd/vnodeStream.c
View file

@ -151,7 +151,7 @@ static int32_t buildRsp(SSDataBlock* pBlock, void** data, size_t* size) {
int32_t code = 0;
int32_t lino = 0;
void* buf = NULL;
STREAM_CHECK_CONDITION_GOTO(pBlock == NULL || pBlock->info.rows == 0, TSDB_CODE_STREAM_NO_DATA);
STREAM_CHECK_CONDITION_GOTO(pBlock == NULL || pBlock->info.rows == 0, TSDB_CODE_SUCCESS);
size_t dataEncodeSize = blockGetEncodeSize(pBlock);
buf = rpcMallocCont(dataEncodeSize);
STREAM_CHECK_NULL_GOTO(buf, terrno);

8
source/libs/new-stream/src/streamTriggerTask.c
View file

@ -2440,20 +2440,20 @@ int32_t streamTriggerProcessRsp(SStreamTask *pStreamTask, SRpcMsg *pRsp) {
case STRIGGER_PULL_WAL_TS_DATA:
case STRIGGER_PULL_WAL_TRIGGER_DATA:
case STRIGGER_PULL_WAL_CALC_DATA: {
if (pRsp->code == TSDB_CODE_SUCCESS || pRsp->code == TSDB_CODE_STREAM_NO_DATA) {
if (pRsp->code == TSDB_CODE_SUCCESS) {
SSDataBlock *pResBlock = pContext->pullResDataBlock[pReq->type];
if (pResBlock == NULL) {
pResBlock = taosMemoryCalloc(1, sizeof(SSDataBlock));
QUERY_CHECK_NULL(pResBlock, code, lino, _end, terrno);
pContext->pullResDataBlock[pReq->type] = pResBlock;
}
if (pRsp->code == TSDB_CODE_SUCCESS) {
if (pRsp->contLen == 0){
blockDataEmpty(pResBlock);
} else {
const char *pEnd = pRsp->pCont;
code = blockDecode(pResBlock, pRsp->pCont, &pEnd);
QUERY_CHECK_CODE(code, lino, _end);
QUERY_CHECK_CONDITION(pEnd == pRsp->pCont + pRsp->contLen, code, lino, _end, TSDB_CODE_INTERNAL_ERROR);
} else if (pRsp->code == TSDB_CODE_STREAM_NO_DATA) {
blockDataEmpty(pResBlock);
}
code = strtcProcessPullRsp(pContext, pResBlock);
QUERY_CHECK_CODE(code, lino, _end);