Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/dnode/vnode/src/vnd/vnodeStream.c
Original file line number Diff line number Diff line change
Expand Up @@ -1192,7 +1192,7 @@ static int32_t scanSubmitTbData(SVnode* pVnode, SDecoder *pCoder, SStreamTrigger
} else {
colId = -1;
}
ST_TASK_DLOG("%s vtable colId:%d, i:%d, uid:%" PRId64, __func__, colId, i, submitTbData.uid);
ST_TASK_TLOG("%s vtable colId:%d, i:%d, uid:%" PRId64, __func__, colId, i, submitTbData.uid);
} else {
colId = pColData->info.colId;
}
Expand Down
4 changes: 4 additions & 0 deletions source/libs/new-stream/src/streamTriggerMerger.c
Original file line number Diff line number Diff line change
Expand Up @@ -2105,6 +2105,10 @@ int32_t stNewVtableMergerNextDataBlock(SSTriggerNewVtableMerger *pMerger, SSData
*pEndIdx = nrows;

_end:
if (p != NULL) {
colDataDestroy(p);
taosMemoryFreeClear(p);
}
if (TSDB_CODE_SUCCESS != code) {
ST_TASK_ELOG("%s failed at line %d since %s", __func__, lino, tstrerror(code));
}
Expand Down
24 changes: 24 additions & 0 deletions source/libs/new-stream/src/streamTriggerTask.c
Original file line number Diff line number Diff line change
Expand Up @@ -5204,6 +5204,30 @@ static int32_t stRealtimeContextProcCalcRsp(SSTriggerRealtimeContext *pContext,
// continue check if the context is waiting for any available request
code = stRealtimeContextCheck(pContext);
QUERY_CHECK_CODE(code, lino, _end);
} else if (!pTask->lowLatencyCalc && pContext->pMaxDelayHeap->min != NULL &&
pContext->status == STRIGGER_CONTEXT_IDLE) {
// continue check if there are delayed requests to be processed
SSTriggerRealtimeGroup *pMinGroup = container_of(pContext->pMaxDelayHeap->min, SSTriggerRealtimeGroup, heapNode);
if (pMinGroup->nextExecTime > taosGetTimestampNs()) {
SListIter iter = {0};
SListNode *pNode = NULL;
taosWLockLatch(&gStreamTriggerWaitLatch);
tdListInitIter(&gStreamTriggerWaitList, &iter, TD_LIST_FORWARD);
while ((pNode = tdListNext(&iter)) != NULL) {
StreamTriggerWaitInfo *pInfo = (StreamTriggerWaitInfo *)pNode->data;
if (pInfo->streamId == pTask->task.streamId && pInfo->taskId == pTask->task.taskId &&
pInfo->sessionId == pContext->sessionId) {
TD_DLIST_POP(&gStreamTriggerWaitList, pNode);
break;
}
}
taosWUnLockLatch(&gStreamTriggerWaitLatch);
if (pNode != NULL) {
taosMemoryFreeClear(pNode);
code = stRealtimeContextCheck(pContext);
QUERY_CHECK_CODE(code, lino, _end);
}
}
}
} else {
code = tdListAppend(&pContext->retryCalcReqs, &pReq);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def test_stream_usecase_em(self):
# main test
#

tdSql.execute(f"alter all dnodes 'debugflag 131';")
tdSql.execute(f"alter all dnodes 'debugflag 135';")

# env
tdStream.createSnode()
Expand Down
Loading