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

fix(query):revoke remove operation

This commit is contained in:
Haojun Liao 2022-07-19 10:28:29 +08:00
parent 484d043b44
commit 2f199bd80b
1 changed files with 1 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
source/libs/executor/src/scanoperator.c
View File

@ -1224,42 +1224,7 @@ static int32_t setBlockIntoRes(SStreamScanInfo* pInfo, const SSDataBlock* pBlock
return 0;
}
// todo opt perf
static SSDataBlock* doDropInvisibleCol(SSDataBlock* pBlock, SArray* pColMatchInfo) {
size_t numOfMatchInfo = taosArrayGetSize(pColMatchInfo);
bool ignoreCols = false;
for (int32_t j = 0; j < numOfMatchInfo; ++j) {
SColMatchInfo* pInfo = taosArrayGet(pColMatchInfo, j);
if (!pInfo->output) {
ignoreCols = true;
break;
}
}
SSDataBlock* pRes = createOneDataBlock(pBlock, true);
if (ignoreCols) {
int32_t i = 0;
while(i < taosArrayGetSize(pRes->pDataBlock)) {
SColumnInfoData* pCol = taosArrayGet(pBlock->pDataBlock, i);
for (int32_t j = 0; j < numOfMatchInfo; ++j) {
SColMatchInfo* pInfo = taosArrayGet(pColMatchInfo, j);
if (pInfo->colId == pCol->info.colId && !pInfo->output) {
taosArrayRemove(pBlock->pDataBlock, i);
i -= 1;
break;
}
}
i += 1;
}
}
pRes->info.rows = pBlock->info.rows;
return pRes;
}
static SSDataBlock* doStreamScanImpl(SOperatorInfo* pOperator) {
static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
// NOTE: this operator does never check if current status is done or not
SExecTaskInfo* pTaskInfo = pOperator->pTaskInfo;
SStreamScanInfo* pInfo = pOperator->info;
@ -1479,16 +1444,6 @@ static SSDataBlock* doStreamScanImpl(SOperatorInfo* pOperator) {
}
}
static SSDataBlock* doStreamScan(SOperatorInfo* pOperator) {
SSDataBlock* pBlock = doStreamScanImpl(pOperator);
if (pBlock != NULL) {
SStreamScanInfo* pInfo = (SStreamScanInfo*) pOperator->info;
return doDropInvisibleCol(pInfo->pRes, pInfo->pColMatchInfo);
} else {
return NULL;
}
}
static SSDataBlock* doRawScan(SOperatorInfo* pInfo) {
//
return NULL;