Skip to content

T
TDengine

taosdata / TDengine
1 年多 前同步成功

通知 1185
Star 22016
Fork 4786
T
TDengine
未验证 提交 6a9191fc 编写于 作者: H Haojun Liao 提交者： GitHub
浏览文件
操作

Merge pull request #22127 from taosdata/fix/fill_history 

optimize fill history
上级 682a72f1 8a6ed67f
隐藏空白更改
内联 并排
Showing with 1 addition and 5 deletion
source/libs/executor/inc/executorInt.h
浏览文件 @ 6a9191fc
...@@ -366,7 +366,6 @@ typedef struct SStreamScanInfo { ...@@ -366,7 +366,6 @@ typedef struct SStreamScanInfo {
SNode* pTagIndexCond; SNode* pTagIndexCond;
// recover // recover
int32_t blockRecoverContiCnt;
int32_t blockRecoverTotCnt; int32_t blockRecoverTotCnt;
SSDataBlock* pRecoverRes; SSDataBlock* pRecoverRes;
......
source/libs/executor/src/scanoperator.c
浏览文件 @ 6a9191fc
...@@ -1820,9 +1820,7 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) { ...@@ -1820,9 +1820,7 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1 || if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1 ||
pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN2) { pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN2) {
if (pInfo->blockRecoverContiCnt > 100) { if (isTaskKilled(pTaskInfo)) {
pInfo->blockRecoverTotCnt += pInfo->blockRecoverContiCnt;
pInfo->blockRecoverContiCnt = 0;
return NULL; return NULL;
} }
...@@ -1867,7 +1865,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) { ...@@ -1867,7 +1865,6 @@ static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
pInfo->pRecoverRes = doTableScan(pInfo->pTableScanOp); pInfo->pRecoverRes = doTableScan(pInfo->pTableScanOp);
if (pInfo->pRecoverRes != NULL) { if (pInfo->pRecoverRes != NULL) {
pInfo->blockRecoverContiCnt++;
calBlockTbName(pInfo, pInfo->pRecoverRes); calBlockTbName(pInfo, pInfo->pRecoverRes);
if (!pInfo->igCheckUpdate && pInfo->pUpdateInfo) { if (!pInfo->igCheckUpdate && pInfo->pUpdateInfo) {
if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1) { if (pStreamInfo->recoverStep == STREAM_RECOVER_STEP__SCAN1) {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或