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

fix: remove mock code

This commit is contained in:
dapan1121 2022-07-05 10:52:33 +08:00
parent 6bfe5df94a
commit 39a31e8d25
5 changed files with 1 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/libs/executor/executor.h
View File

@ -37,9 +37,6 @@ typedef struct SReadHandle {
void* mnd; void* mnd;
SMsgCb* pMsgCb; SMsgCb* pMsgCb;
/* XXXXXXXXXXXXXXXXXXXX */
int32_t deleteQuery;
/* XXXXXXXXXXXXXXXXXXXX */
// int8_t initTsdbReader; // int8_t initTsdbReader;
bool tqReader; bool tqReader;
} SReadHandle; } SReadHandle;

4
source/libs/executor/inc/executorimpl.h
View File

@ -151,10 +151,6 @@ typedef struct SExecTaskInfo {
jmp_buf env; // jump to this position when error happens. jmp_buf env; // jump to this position when error happens.
EOPTR_EXEC_MODEL execModel; // operator execution model [batch model|stream model] EOPTR_EXEC_MODEL execModel; // operator execution model [batch model|stream model]
struct SOperatorInfo* pRoot; struct SOperatorInfo* pRoot;
/* XXXXXXXXXXXXXXXXXXXX */
SReadHandle* pHandle;
/* XXXXXXXXXXXXXXXXXXXX */
} SExecTaskInfo; } SExecTaskInfo;
enum { enum {

23
source/libs/executor/src/executorMain.c
View File

@ -139,29 +139,8 @@ int32_t qExecTask(qTaskInfo_t tinfo, SSDataBlock** pRes, uint64_t* useconds) {
qDebug("%s execTask is launched", GET_TASKID(pTaskInfo)); qDebug("%s execTask is launched", GET_TASKID(pTaskInfo));
int64_t st = taosGetTimestampUs(); int64_t st = taosGetTimestampUs();
/* XXXXXXXXXXXXXXXXXXXX */
if (pTaskInfo->pHandle->deleteQuery) {
static int32_t first = 1;
if (first) {
*pRes = createDataBlock();
int64_t rows = 33;
SColumnInfoData infoData = createColumnInfoData(TSDB_DATA_TYPE_BIGINT, 8, 1);
blockDataAppendColInfo(*pRes, &infoData);
blockDataEnsureCapacity(*pRes, 1);
(*pRes)->info.rows = 1;
SColumnInfoData* pCol1 = taosArrayGet((*pRes)->pDataBlock, 0); *pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot);
colDataAppend(pCol1, 0, (char*)&rows, false);
first = 0;
} else {
*pRes = NULL;
}
} else {
/* XXXXXXXXXXXXXXXXXXXX */
*pRes = pTaskInfo->pRoot->fpSet.getNextFn(pTaskInfo->pRoot);
/* XXXXXXXXXXXXXXXXXXXX */
}
/* XXXXXXXXXXXXXXXXXXXX */
uint64_t el = (taosGetTimestampUs() - st); uint64_t el = (taosGetTimestampUs() - st);
pTaskInfo->cost.elapsedTime += el; pTaskInfo->cost.elapsedTime += el;

3
source/libs/executor/src/executorimpl.c
View File

@ -4770,9 +4770,6 @@ int32_t createExecTaskInfoImpl(SSubplan* pPlan, SExecTaskInfo** pTaskInfo, SRead
&(*pTaskInfo)->tableqinfoList, pPlan->user); &(*pTaskInfo)->tableqinfoList, pPlan->user);
/* XXXXXXXXXXXXXXXXXXXX */
(*pTaskInfo)->pHandle = pHandle;
/* XXXXXXXXXXXXXXXXXXXX */
if (NULL == (*pTaskInfo)->pRoot) { if (NULL == (*pTaskInfo)->pRoot) {
code = (*pTaskInfo)->code; code = (*pTaskInfo)->code;
goto _complete; goto _complete;

5
source/libs/qworker/src/qworker.c
View File

@ -930,11 +930,6 @@ int32_t qwProcessDelete(QW_FPARAMS_DEF, SQWMsg *qwMsg, SDeleteRes *pRes) {
} }
ctx.plan = plan; ctx.plan = plan;
/* XXXXXXXXXXXXXXXXXXXX */
SReadHandle *phandle = (SReadHandle*)qwMsg->node;
phandle->deleteQuery = 1;
/* XXXXXXXXXXXXXXXXXXXX */
code = qCreateExecTask(qwMsg->node, mgmt->nodeId, tId, plan, &pTaskInfo, &sinkHandle, NULL, OPTR_EXEC_MODEL_BATCH); code = qCreateExecTask(qwMsg->node, mgmt->nodeId, tId, plan, &pTaskInfo, &sinkHandle, NULL, OPTR_EXEC_MODEL_BATCH);
if (code) { if (code) {