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

refactor(query): do some internal refactor.

This commit is contained in:
Haojun Liao 2022-09-20 14:37:50 +08:00
parent ed0b92bb33
commit af36cb37e6
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1135,35 +1135,34 @@ void doFilter(const SNode* pFilterNode, SSDataBlock* pBlock, const SArray* pColM
} }
int64_t st1 = taosGetTimestampUs(); int64_t st1 = taosGetTimestampUs();
pError("init completed, el: %d us", st1-st); // pError("init completed, el: %d us", st1 - st);
size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock); size_t numOfCols = taosArrayGetSize(pBlock->pDataBlock);
SFilterColumnParam param1 = {.numOfCols = numOfCols, .pDataBlock = pBlock->pDataBlock}; SFilterColumnParam param1 = {.numOfCols = numOfCols, .pDataBlock = pBlock->pDataBlock};
code = filterSetDataFromSlotId(filter, &param1); code = filterSetDataFromSlotId(filter, &param1);
int64_t st2 = taosGetTimestampUs(); int64_t st2 = taosGetTimestampUs();
pError("set data from slotid, el: %d us", st2-st1); // pError("set data from slotid, el: %d us", st2 - st1);
int8_t* rowRes = NULL; int8_t* rowRes = NULL;
// todo the keep seems never to be True?? // todo the keep seems never to be True??
int32_t status = 0; int32_t status = 0;
bool keep = filterExecute(filter, pBlock, &rowRes, NULL, param1.numOfCols, &status); bool keep = filterExecute(filter, pBlock, &rowRes, NULL, param1.numOfCols, &status);
if (pFilterInfo == NULL) { if (pFilterInfo == NULL) {
filterFreeInfo(filter); filterFreeInfo(filter);
} }
int64_t st3 = taosGetTimestampUs(); int64_t st3 = taosGetTimestampUs();
pError("do filter, el: %d us", st3-st2);
extractQualifiedTupleByFilterResult(pBlock, rowRes, keep, status); extractQualifiedTupleByFilterResult(pBlock, rowRes, keep, status);
int64_t st4 = taosGetTimestampUs(); int64_t st4 = taosGetTimestampUs();
pError("extract result filter, el: %d us", st4-st3); pError("extract result filter, el: %d us, rows:%d", st4 - st3, pBlock->info.rows);
if (pColMatchInfo != NULL) { if (pColMatchInfo != NULL) {
for (int32_t i = 0; i < taosArrayGetSize(pColMatchInfo); ++i) { for (int32_t i = 0; i < taosArrayGetSize(pColMatchInfo); ++i) {
SColMatchInfo* pInfo = taosArrayGet(pColMatchInfo, i); SColMatchInfo* pInfo = taosArrayGet(pColMatchInfo, i);
if (pInfo->colId == PRIMARYKEY_TIMESTAMP_COL_ID) { if (pInfo->colId == PRIMARYKEY_TIMESTAMP_COL_ID) {
@ -1205,7 +1204,7 @@ void extractQualifiedTupleByFilterResult(SSDataBlock* pBlock, const int8_t* rowR
blockDataDestroy(px); // fix memory leak blockDataDestroy(px); // fix memory leak
} else if (status == FILTER_RESULT_NONE_QUALIFIED) { } else if (status == FILTER_RESULT_NONE_QUALIFIED) {
pBlock->info.rows = 0; pBlock->info.rows = 0;
} else { } else {
SSDataBlock* px = createOneDataBlock(pBlock, true); SSDataBlock* px = createOneDataBlock(pBlock, true);